diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3c81745..6b29e8d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -4,19 +4,19 @@
       <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
+            <el-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -197,10 +197,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -275,10 +275,10 @@
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        wellTypeName: row.wellTypeName, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
+        wellTypeName: row.wellTypeName, // 点位类型
         bfztName: row.bfztName,
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
@@ -327,12 +327,13 @@
       }
       // 处理图片
       const urls = row.photos.split(';')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       for (const url of urls) {
         if (url) {
           this.imageList.push({ name: url, url: base_url + url })
         }
       }
+      console.log(this.imageList)
       // 获取井下监控数据
       this.listLoading = true
       watchDataByWell(row.id).then(response => {
@@ -340,6 +341,7 @@
         this.dataList = response.data
       })
     },
+    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       getAreaByDept(this.wellForm.deptid).then(response => {

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3c81745..6b29e8d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -4,19 +4,19 @@
       <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
+            <el-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -197,10 +197,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -275,10 +275,10 @@
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        wellTypeName: row.wellTypeName, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
+        wellTypeName: row.wellTypeName, // 点位类型
         bfztName: row.bfztName,
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
@@ -327,12 +327,13 @@
       }
       // 处理图片
       const urls = row.photos.split(';')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       for (const url of urls) {
         if (url) {
           this.imageList.push({ name: url, url: base_url + url })
         }
       }
+      console.log(this.imageList)
       // 获取井下监控数据
       this.listLoading = true
       watchDataByWell(row.id).then(response => {
@@ -340,6 +341,7 @@
         this.dataList = response.data
       })
     },
+    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       getAreaByDept(this.wellForm.deptid).then(response => {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 371b539..3aed2b7 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -4,20 +4,20 @@
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择点位类型" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -228,9 +228,9 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -260,14 +260,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -374,9 +374,9 @@
       this.fetchWellType()
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
         deptid: row.deptid, // 权属单位
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
@@ -418,7 +418,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3c81745..6b29e8d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -4,19 +4,19 @@
       <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
+            <el-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -197,10 +197,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -275,10 +275,10 @@
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        wellTypeName: row.wellTypeName, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
+        wellTypeName: row.wellTypeName, // 点位类型
         bfztName: row.bfztName,
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
@@ -327,12 +327,13 @@
       }
       // 处理图片
       const urls = row.photos.split(';')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       for (const url of urls) {
         if (url) {
           this.imageList.push({ name: url, url: base_url + url })
         }
       }
+      console.log(this.imageList)
       // 获取井下监控数据
       this.listLoading = true
       watchDataByWell(row.id).then(response => {
@@ -340,6 +341,7 @@
         this.dataList = response.data
       })
     },
+    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       getAreaByDept(this.wellForm.deptid).then(response => {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 371b539..3aed2b7 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -4,20 +4,20 @@
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择点位类型" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -228,9 +228,9 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -260,14 +260,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -374,9 +374,9 @@
       this.fetchWellType()
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
         deptid: row.deptid, // 权属单位
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
@@ -418,7 +418,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index db958b7..4034581 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -4,17 +4,17 @@
       <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-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-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-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -95,10 +95,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -151,10 +151,10 @@
         const row = response.data
         this.wellForm = {
           id: row.id, // 井id
-          wellCode: row.wellCode, // 井编号
-          wellName: row.wellName, // 井名称
-          wellType: row.wellType, // 井类型
-          wellTypeName: row.wellTypeName, // 井类型
+          wellCode: row.wellCode, // 点位编号
+          wellName: row.wellName, // 点位名称
+          wellType: row.wellType, // 点位类型
+          wellTypeName: row.wellTypeName, // 点位类型
           deptid: row.deptid, // 权属单位
           deptName: row.deptName, // 权属单位
           deep: row.deep, // 井深，

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3c81745..6b29e8d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -4,19 +4,19 @@
       <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
+            <el-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -197,10 +197,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -275,10 +275,10 @@
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        wellTypeName: row.wellTypeName, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
+        wellTypeName: row.wellTypeName, // 点位类型
         bfztName: row.bfztName,
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
@@ -327,12 +327,13 @@
       }
       // 处理图片
       const urls = row.photos.split(';')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       for (const url of urls) {
         if (url) {
           this.imageList.push({ name: url, url: base_url + url })
         }
       }
+      console.log(this.imageList)
       // 获取井下监控数据
       this.listLoading = true
       watchDataByWell(row.id).then(response => {
@@ -340,6 +341,7 @@
         this.dataList = response.data
       })
     },
+    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       getAreaByDept(this.wellForm.deptid).then(response => {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 371b539..3aed2b7 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -4,20 +4,20 @@
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择点位类型" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -228,9 +228,9 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -260,14 +260,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -374,9 +374,9 @@
       this.fetchWellType()
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
         deptid: row.deptid, // 权属单位
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
@@ -418,7 +418,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index db958b7..4034581 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -4,17 +4,17 @@
       <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-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-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-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -95,10 +95,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -151,10 +151,10 @@
         const row = response.data
         this.wellForm = {
           id: row.id, // 井id
-          wellCode: row.wellCode, // 井编号
-          wellName: row.wellName, // 井名称
-          wellType: row.wellType, // 井类型
-          wellTypeName: row.wellTypeName, // 井类型
+          wellCode: row.wellCode, // 点位编号
+          wellName: row.wellName, // 点位名称
+          wellType: row.wellType, // 点位类型
+          wellTypeName: row.wellTypeName, // 点位类型
           deptid: row.deptid, // 权属单位
           deptName: row.deptName, // 权属单位
           deep: row.deep, // 井深，
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index b6d1040..983f4bf 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -2,10 +2,10 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" size="small" placeholder="选择井类型" clearable>
+        <el-select v-model="listQuery.wellType" size="small" placeholder="选择点位类型" clearable>
           <el-option
             v-for="item in wellTypeList"
             :key="item.value"
@@ -136,12 +136,12 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
@@ -156,7 +156,7 @@
           align: 'center'
         },
         {
-          text: '井类型',
+          text: '点位类型',
           value: 'wellTypeName',
           align: 'center'
         },
@@ -180,8 +180,8 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      showWellType: true, // 是否显示井类型下拉
-      wellTypeList: null, // 井类型列表
+      showWellType: true, // 是否显示点位类型下拉
+      wellTypeList: null, // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -217,6 +217,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
+      console.log(row, '============++++')
       this.detailShow = true
       this.$refs.detailwell.initDialog(true, row)
     },
@@ -448,7 +449,7 @@
         this.listLoading = false
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []

diff --git a/mock/system/user.js b/mock/system/user.js
index 173e2ab..b3d79cb 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -111,7 +111,7 @@
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' },
     { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' },
     { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' },
-    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据井类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
+    { 'code': 'well_statics_by_type', 'icon': '', 'id': '1178233559681990658', 'ismenu': '0', 'levels': 2, 'name': '根据点位类型统计井数量', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/wellStaticsByType' },
     { 'code': 'tempdata_list', 'icon': '', 'id': '1177452897274298370', 'ismenu': '0', 'levels': 2, 'name': '温湿度数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/tempdata/list' },
     { 'code': 'statics_alarms_by_day', 'icon': '', 'id': '1275025814173327362', 'ismenu': '0', 'levels': 2, 'name': '7日报警次数统计', 'num': 0, 'parentId': '1275011720930205698', 'resourceType': '04', 'url': '/statics/alarmsByDay' },
     { 'code': 'welllocadata_list', 'icon': '', 'id': '1177453185695612929', 'ismenu': '0', 'levels': 2, 'name': '井盖定位数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/welllocadata/list' },
diff --git a/mock/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
index 8042352..2c27ac8 100644
--- a/mock/systemConfig/deptPermission.js
+++ b/mock/systemConfig/deptPermission.js
@@ -2,7 +2,7 @@
   {
     'deptid': '4324324234',
     'deptName': '组织名称一',
-    'wellType': '支持井类型一',
+    'wellType': '支持点位类型一',
     'deviceType': '支持设备类型二',
     'lng': '123.122',
     'lat': '23.3232'
@@ -10,7 +10,7 @@
   {
     'deptid': '4456324234',
     'deptName': '组织名称二',
-    'wellType': '支持井类型二',
+    'wellType': '支持点位类型二',
     'deviceType': '支持设备类型二',
     'lng': '143.423',
     'lat': '56.1432'
diff --git a/mock/warning/deviceStatics.js b/mock/warning/deviceStatics.js
index 030c6fa..0d63b0d 100644
--- a/mock/warning/deviceStatics.js
+++ b/mock/warning/deviceStatics.js
@@ -51,8 +51,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -67,8 +67,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '4',
@@ -83,8 +83,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '9',
@@ -99,8 +99,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '19',
@@ -115,8 +115,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '3',
@@ -131,8 +131,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '6',
@@ -147,8 +147,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
@@ -163,8 +163,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '12',
@@ -179,8 +179,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '5',
@@ -195,8 +195,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '7',
@@ -211,8 +211,8 @@
   {
     'alarmType': '有害气体超标报警',
     'count': '9',
-    'wellCode': '井编号',
-    'wellName': '井名称',
+    'wellCode': '点位编号',
+    'wellName': '点位名称',
     'deptid': '组织id',
     'deptName': '燃气公司',
     'alarmCount': '2',
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 9091be3..e515b64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/data/dataStatics.js b/src/api/data/dataStatics.js
index 04f756a..b9ccd3d 100644
--- a/src/api/data/dataStatics.js
+++ b/src/api/data/dataStatics.js
@@ -28,7 +28,7 @@
   })
 }
 
-// 根据井类型统计井数量
+// 根据点位类型统计井数量
 export function wellStaticByType(params) {
   return request({
     url: 'statics/wellStaticsByType',
diff --git a/src/api/system/area.js b/src/api/system/area.js
index 3b16832..b24a1b7 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'sys/config/getAreaByDept',
+    url: 'config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 22ad5cb..0ca7f44 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/viewsConfig',
       name: 'ViewsConfig',
-      component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'),
+      component: () => import('@/views/systemConfig/viewsConfig/viewsConfig'),
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
diff --git a/src/store/getters.js b/src/store/getters.js
index c6a860e..b6442ae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,7 +17,7 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
-  wellTypes: state => state.user.wellTypes, // 用户支持的井类型
+  wellTypes: state => state.user.wellTypes, // 用户支持的点位类型
   deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
   communications: state => state.user.communications, // 用户支持的通讯方式
   area: state => state.user.area, // 用户所在区域
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 02630c2..4074e3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,7 +15,7 @@
     roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
-    wellTypes: [], // 支持井类型
+    wellTypes: [], // 支持点位类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
     area: '', // 默认地区
@@ -140,7 +140,7 @@
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
           } else {
-            reject('该用户不支持任何井类型')
+            reject('该用户不支持任何点位类型')
           }
           if (data.deviceTypes && data.deviceTypes.length > 0) {
             commit('SET_DEVICETYPES', data.deviceTypes)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 43d5f3b..1abdc08 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,6 +30,12 @@
   return date.Format(fmt)
 }
 
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
+  return { startTime, endTime }
+}
+
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 8dbb004..d1ab44e 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -9,9 +9,9 @@
   })
 }
 
-// 根据用户权限判断是否要显示井类型下拉框
+// 根据用户权限判断是否要显示点位类型下拉框
 export function showWellType() {
-  console.log('是否显示井类型下拉')
+  console.log('是否显示点位类型下拉')
   const wellTypes = store.getters.wellTypes
   if (wellTypes.length > 1) return true
   else return false
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 03800e3..39b3ff4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -2,7 +2,7 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item v-if="operation">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -61,7 +61,7 @@
       </el-row>
       <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column label="井编号" align="center" show-overflow-tooltip>
+        <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
               {{ scope.row.wellCode }}
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3415fa2..8d92fa3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -5,7 +5,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号"
+          placeholder="点位编号"
           clearable
         />
       </search-item>
@@ -129,7 +129,7 @@
       timeRange: [], // 时间范围
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index c125c1f..135a723 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -105,8 +105,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -221,8 +221,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 5b8a4bb..20c360f 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -104,13 +104,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index 056644a..685e2d6 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -3,7 +3,7 @@
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
       <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="concencode">
+          <el-form-item label="点位编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -110,8 +110,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 4ac072c..a45a5be 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -6,7 +6,7 @@
         <el-input
           v-model.trim="listQuery.keywords"
           size="small"
-          placeholder="井编号/设备编号"
+          placeholder="点位编号/设备编号"
           clearable
         />
       </search-item>
@@ -103,13 +103,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/components/detailAlarmStatics.vue b/src/views/alarmStatics/components/detailAlarmStatics.vue
index 9d3bb0d..d379445 100644
--- a/src/views/alarmStatics/components/detailAlarmStatics.vue
+++ b/src/views/alarmStatics/components/detailAlarmStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 486a4d0..9d8edd5 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -18,7 +18,7 @@
       right: 60
     }
     this.title = {
-      text: '井类型数量统计'
+      text: '点位类型数量统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -26,7 +26,7 @@
       },
       barWidth: 15,
       labelMap: {
-        'wellTypeName': '井类型',
+        'wellTypeName': '点位类型',
         'wellCount': '井数量'
       },
       dimension: ['wellTypeName'],
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index cf174a6..e179dcc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
           <well-count-by-bfzt />
         </el-card>
       </el-col>
-      <!--井类型统计-->
+      <!--点位类型统计-->
       <el-col v-if="hasPerm('/statics/wellStaticsByType')" :span="14">
         <el-card shadow="never">
           <well-count-by-type />
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index ba47342..c3acf3e 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputn v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 6594913..97d58ce 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-inputb v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -106,7 +106,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 319847a..fae7b1f 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 97b2120..f44b16e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -97,7 +97,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 12113b2..8240a44 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -4,7 +4,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -118,7 +118,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
@@ -260,7 +260,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
@@ -306,7 +306,7 @@
             align: 'center'
           },
           {
-            text: '井编号',
+            text: '点位编号',
             value: 'wellCode',
             align: 'center'
           },
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index cb5f11f..1565ba4 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 8e3a1ca..91cae81 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 57cd3fc..8b62d97 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
@@ -90,7 +90,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index cfebaaa..1f714d6 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item size="small">
         <dept-select
@@ -95,7 +95,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index ed1a155..6e12a50 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
         <dept-select
@@ -96,7 +96,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5f7e10c..4383d7f 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.wellCode" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.deviceType" size="small" placeholder="监测指标" clearable>
@@ -55,7 +55,7 @@
       <el-row>
         <h3>说明</h3>
         <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的点位编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -99,9 +99,9 @@
   },
   methods: {
     search() {
-      // 验证井编号不能为空
+      // 验证点位编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('井编号不能为空')
+        this.$message.error('点位编号不能为空')
         return
       }
       // 验证设备类型
@@ -139,7 +139,7 @@
       }
     },
     fetchData() {
-      // 首先判断闸井编号是否存在
+      // 首先判断闸点位编号是否存在
       const params = {
         wellCode: this.listQuery.wellCode
       }
@@ -171,7 +171,7 @@
             that.$message.warning('查询跨度不能超过一年')
           }
         } else {
-          that.$message.warning('井不存在，请确认井编号无误')
+          that.$message.warning('井不存在，请确认点位编号无误')
           that.chartShow = false
         }
       })
diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue
index 190ddc9..027ae62 100644
--- a/src/views/dataView/components/panelGroup.vue
+++ b/src/views/dataView/components/panelGroup.vue
@@ -64,7 +64,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: '',
           align: 'center'
         },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index 71fa2d9..dc8b192 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -47,7 +47,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" disabled type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 111a829..fa37aa8 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,8 +4,8 @@
     <search-area size="small" @search="search">
       <search-item>
         <el-input
-          size="small"
           v-model="listQuery.devcode"
+          size="small"
           type="text"
           placeholder="设备编号"
           clearable
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 0ae2cab..31eb158 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -52,7 +52,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
       rules: {
         // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
         installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceStatics/components/detailDeviceStatics.vue b/src/views/deviceStatics/components/detailDeviceStatics.vue
index 1017925..53672fc 100644
--- a/src/views/deviceStatics/components/detailDeviceStatics.vue
+++ b/src/views/deviceStatics/components/detailDeviceStatics.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -188,14 +188,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -218,7 +218,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/deviceStatics/components/deviceCountByDept.vue b/src/views/deviceStatics/components/deviceCountByDept.vue
index 79224e7..d5624ad 100644
--- a/src/views/deviceStatics/components/deviceCountByDept.vue
+++ b/src/views/deviceStatics/components/deviceCountByDept.vue
@@ -71,7 +71,7 @@
         right: 60
       },
       // title: {
-      //   text: '井类型数量统计'
+      //   text: '点位类型数量统计'
       // },
       chartSettings: {
         itemStyle: {
diff --git a/src/views/deviceStatics/components/listdeviceOffline.vue b/src/views/deviceStatics/components/listdeviceOffline.vue
index 3b01bf8..8ea7861 100644
--- a/src/views/deviceStatics/components/listdeviceOffline.vue
+++ b/src/views/deviceStatics/components/listdeviceOffline.vue
@@ -125,7 +125,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellLooseness.vue b/src/views/intelligenceRoom/components/wellLooseness.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellLooseness.vue
+++ b/src/views/intelligenceRoom/components/wellLooseness.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/intelligenceRoom/components/wellSignal.vue b/src/views/intelligenceRoom/components/wellSignal.vue
index f2156e9..254f89c 100644
--- a/src/views/intelligenceRoom/components/wellSignal.vue
+++ b/src/views/intelligenceRoom/components/wellSignal.vue
@@ -82,12 +82,12 @@
       zoom: 12, // 地图缩放比例
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 372e6a8..d92669b 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号">
+          <el-form-item label="点位编号">
             <el-input v-model="jobForm.wellCode" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
@@ -140,7 +140,7 @@
       dialogStatus: '', // 对话框类型：create,update
       jobForm: {
         jobCode: '', // 工单编号
-        wellCode: '', // 井编号
+        wellCode: '', // 点位编号
         devcode: '', // 设备编号
         position: '', // 详细地址
         coordinateX: '',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 6e30511..7d6f313 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,7 +10,7 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -153,7 +153,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 948fb24..c6616ba 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -121,7 +121,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index da9853a..2cf9348 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -3,7 +3,7 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
@@ -120,7 +120,7 @@
           align: 'center'
         },
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 0c51a6c..06231ae 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -59,7 +59,7 @@
   data() {
     return {
       columns: [
-        { text: '井编号', value: 'wellCode', width: 110, align: 'center' },
+        { text: '点位编号', value: 'wellCode', width: 110, align: 'center' },
         { text: '设备编号', value: 'devcode', width: 120, align: 'center' },
         { text: '告警原因', value: 'alarmContent', align: 'center' },
         { text: '时间', value: 'alarmTime', width: 180, align: 'center' }
diff --git a/src/views/overview/components/infoWindowAlarm.vue b/src/views/overview/components/infoWindowAlarm.vue
index d69f178..42b11f9 100644
--- a/src/views/overview/components/infoWindowAlarm.vue
+++ b/src/views/overview/components/infoWindowAlarm.vue
@@ -15,7 +15,7 @@
         <div>设备编号：<span>{{ alarm.devcode }}</span></div>
       </div>
       <el-divider />
-      <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+      <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
       <div>权属单位：{{ alarmInfo.deptName }}</div>
       <div>详细地址：{{ alarmInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/infoWindowWell.vue b/src/views/overview/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/overview/components/infoWindowWell.vue
+++ b/src/views/overview/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/overview/components/popupDataFilter.vue b/src/views/overview/components/popupDataFilter.vue
index db2bdf8..bca0296 100644
--- a/src/views/overview/components/popupDataFilter.vue
+++ b/src/views/overview/components/popupDataFilter.vue
@@ -17,8 +17,8 @@
             <el-form-item label="所属组织机构">
               <dept-select style="width:100%" :need-top="false" placeholder="请选择组织机构" clearable />
             </el-form-item>
-            <el-form-item v-if="wellTypeList.length>1" label="井类型">
-              <el-select v-model="listQuery.wellType" placeholder="选择井类型" style="width:100%" clearable>
+            <el-form-item v-if="wellTypeList.length>1" label="点位类型">
+              <el-select v-model="listQuery.wellType" placeholder="选择点位类型" style="width:100%" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -55,13 +55,13 @@
     wellTypeList: {
       type: Array,
       required: true
-    } // 井类型列表
+    } // 点位类型列表
   },
   data() {
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       } // 筛选条件
     }
@@ -83,7 +83,7 @@
     clearSelected() {
       this.listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }
       this.$emit('filter', this.listQuery, false)
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index f172e81..03ef9dc 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -6,10 +6,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="'welltype_'+item.value"
@@ -102,7 +102,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -118,7 +118,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -148,13 +148,13 @@
       showAll: false, // 是否显示全部井
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -181,8 +181,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
@@ -306,11 +306,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -347,7 +347,7 @@
     filterIcon(showMessage = false) {
       // 1.如果有弹窗，将弹窗隐藏
       this.currentWindow.visible = false
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = this.listQuery.keywords
@@ -360,7 +360,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -368,7 +368,7 @@
         if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index a2963a2..aacab93 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -19,7 +19,7 @@
         </a-map-marker>
       </a-map-container>
       <!--搜索框-->
-      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
+      <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -83,13 +83,13 @@
       }, // 工具栏菜单
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '' // 组织机构
       }, // 筛选条件
       count: 30, // 倒计时显示时间
       clock: null, // 计时器
-      showWellType: false, // 是否显示井类型下拉,默认边上
-      wellTypeList: [], // 井类型列表
+      showWellType: false, // 是否显示点位类型下拉,默认边上
+      wellTypeList: [], // 点位类型列表
       commonIcon: 'well-common-green', // 通用图标 绿
       commonIconAlarm: 'well-common-red', // 通用图标 红
       alarmListOri: [], // 原始报警列表
@@ -165,11 +165,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const supportWellTypes = this.$store.getters.wellTypes
         this.wellTypeList = response.data.filter(wellType => {
           return supportWellTypes.findIndex(item => item == wellType.value) > -1
@@ -240,11 +240,11 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       let center = [] // 待移动到的地图中心
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -252,7 +252,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -260,7 +260,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
@@ -276,10 +276,10 @@
     },
     // 过滤报警
     filterAlarm(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 整理筛选条件
       const keywords = listQuery.keywords
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -287,7 +287,7 @@
       // 查询报警的井
       for (const marker of this.alarmWells) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -295,7 +295,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index b052ec3..cf6a7fb 100644
--- a/src/views/overview/overview_old.vue
+++ b/src/views/overview/overview_old.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item label="搜索：">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/地址" clearable />
+            <el-input v-model.trim="listQuery.keywords" placeholder="点位编号/地址" clearable />
           </el-form-item>
           <el-form-item v-if="wellTypeList.length>1">
-            <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+            <el-select v-model="listQuery.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -108,7 +108,7 @@
               {{ wellInfo.wellCode }}
             </div>
             <div class="info-body">
-              <div>井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>点位类型：{{ wellInfo.wellTypeName }}</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -124,7 +124,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider />
-              <div>井类型：{{ alarmInfo.wellTypeName }}</div>
+              <div>点位类型：{{ alarmInfo.wellTypeName }}</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -150,13 +150,13 @@
     return {
       listQuery: {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
@@ -183,8 +183,8 @@
       tableShow: true, // 是否显示告警列表
       tableIcon: 'el-icon-arrow-up',
       count: 30,
-      showWellType: this.showWellType(), // 是否显示井类型下拉
-      wellTypeList: [], // 井类型列表
+      showWellType: this.showWellType(), // 是否显示点位类型下拉
+      wellTypeList: [], // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -274,11 +274,11 @@
         }
       }, 1000)
     },
-    // 获取井类型，显示井类型下拉
+    // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
-        // 如果该用户支持的井类型只有一个，则不显示该筛选框
+        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
@@ -313,7 +313,7 @@
     // 过滤Marker
     filterIcon(showMessage = false) {
       this.currentWindow.visible = false // 弹窗隐藏
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -331,7 +331,7 @@
         if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellType && wellType !== '' && marker.wellType !== wellType) {
           show = false
         }
@@ -423,7 +423,7 @@
       this.loading = true
       const listQuery = {
         keywords: '', // 关键字
-        wellType: '', // 井类型
+        wellType: '', // 点位类型
         deptid: '', // 组织机构
         isAlarm: this.listQuery.isAlarm
       }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
new file mode 100644
index 0000000..28025d3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -0,0 +1,115 @@
+<template>
+  <app-container>
+    <el-row>
+      <el-col :span="4">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always" header="项目">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <div tabIndex="1">
+                燃气集团项目
+              </div>
+              <div tabIndex="2">
+                亦庄项目
+              </div>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <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 @selection-change="handleSelectionChange">
+            <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>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: 300px;
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
new file mode 100644
index 0000000..dfafd2e
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div class="heardTitle">
+      报警推送配置
+    </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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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 === 'create' ? false : true"
+              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="saveData">
+        修改
+      </el-button>
+      <el-button size="small" @click="saveData">
+        保存
+      </el-button>
+      <el-button size="small" @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushCondig',
+  data() {
+    return {
+      // 表单内容
+      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: {
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+.el-row{
+    margin-left: 20px;
+}
+.heardTitle{
+    margin: 10px 0;
+    font-weight: 600;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 0d14449..3ef32ea 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -2,122 +2,63 @@
   <app-container>
     <el-row>
       <!--左半部分-->
-      <el-col :span="5">
+      <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-tree
-                ref="tree2"
-                v-loading="treeLoading"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              >
-                <span slot-scope="{ data }">
-                  <span><i :class="data.icon" /></span>
-                  <span>{{ data.name }}</span>
-                </span>
-              </el-tree>
+              <div tabIndex="1" @click="alarmPushCon">
+                <i class="el-icon-share" />报警推送配置
+              </div>
+              <div tabIndex="2" @click="alarmLevenCon">
+                <i class="el-icon-upload" />报警等级配置
+              </div>
+              <div tabIndex="3" @click="alarmContentCon">
+                <i class="el-icon-copy-document" />报警内容配置
+              </div>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-col :span="20">
+        <alarm-push-condig v-if="alarmPushConShow" />
+        <alarm-leven-config v-if="alarmLevenConShow" />
       </el-col>
     </el-row>
-    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
+import alarmPushCondig from './components/alarmPushCondig'
+import alarmLevenConfig from './components/alarmLevenConfig'
+
 export default {
   name: 'ListAlarmConfig',
-  components: { editAlarmConfig },
+  components: { alarmPushCondig, alarmLevenConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
-      headerValue: null,
-      list: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
-      }
+      alarmPushConShow: true,
+      alarmLevenConShow: false,
+      alarmContentConShow: false
     }
   },
   mounted() {
-    this.fetchDeptTree()
-    this.fetchData()
   },
   methods: {
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.deptTree = [
-        {
-          name: '报警推送配置',
-          id: '1111111',
-          value: 'aaaaa',
-          icon: 'el-icon-share'
-        }
-      ]
+    alarmPushCon() {
+      this.alarmPushConShow = true
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = false
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    alarmLevenCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = true
+      this.alarmContentConShow = false
     },
-    // 获取用户数据
-    fetchData() {
-      this.list = [{}]
-    },
-    // 修改
-    edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+    alarmContentCon() {
+      this.alarmPushConShow = false
+      this.alarmLevenConShow = false
+      this.alarmContentConShow = true
     }
   }
 }
@@ -130,10 +71,27 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+        div{
+          text-align: center;
+          margin: 20px 0;
+          cursor: pointer;
+          padding: 10px;
+          i {
+            margin-right: 10px;
+          }
+        }
       }
     }
   }
+  .user-dept-scroll div:focus{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
+  .user-dept-scroll div:hover{
+    color: gray;
+    background: rgb(242, 238, 238);
+  }
   .headerTeam{
     font-size: 20px;
   }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 429076f..3f9bbae 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -30,11 +30,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="井类型" prop="wellType">
+          <el-form-item label="点位类型" prop="wellType">
             <el-select
               v-model="deviceForm.wellType"
               clearable
-              placeholder="请选择支持井类型"
+              placeholder="请选择支持点位类型"
               :disabled="dialogStatus === 'detail' ? true : false"
             >
               <el-option
@@ -112,14 +112,14 @@
         create: '新增',
         detail: '详情'
       },
-      // 支持井类型
+      // 支持点位类型
       wellTypeList: [
         {
-          label: '井类型一',
+          label: '点位类型一',
           value: '1'
         },
         {
-          label: '井类型二',
+          label: '点位类型二',
           value: '2'
         }
       ],
@@ -134,7 +134,7 @@
       // 表单校验规则
       rules: {
         deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持点位类型必选', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
         lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
         lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index 160b110..b639f89 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -91,7 +91,7 @@
           align: 'center'
         },
         {
-          text: '支持井类型',
+          text: '支持点位类型',
           value: 'wellType',
           align: 'center'
         },
diff --git a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue b/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
deleted file mode 100644
index 7c23fc1..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewAppConfig.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col v-if="maptypeShow" :span="6" class="thirdTitle">
-          <el-button size="small" @click="maptypeShow = false">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      titleText: '',
-      logtitleText: '',
-      mapAddress: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      mapType: '0',
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    mapChange(val) {
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue b/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
deleted file mode 100644
index 68a45ba..0000000
--- a/src/views/systemConfig/viewsConfig/components/viewPcConfig.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <el-row>
-    <el-col>
-      <el-col>
-        <el-col>浏览器页签</el-col>
-        <el-col :span="3" class="secondTitle">
-          页面logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList1"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>标题</el-col>
-        <el-col :span="3" class="secondTitle">
-          系统logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList2"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          标题文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="titleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="editShow" size="small" @click="editShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!editShow" size="small" @click="editShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>登录页</el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页logo：
-        </el-col>
-        <el-col :span="1" class="thirdTitle">
-          <el-upload
-            :limit="1"
-            :show-file-list="false"
-            :file-list="fileList3"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button type="text" size="small">
-              上传 ('图片不能超过200KB')
-            </el-button>
-          </el-upload>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col :span="3" class="secondTitle">
-          登录页文字：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-input
-            v-model="logtitleText"
-            size="small"
-            clearable
-            placeholder="智能窨井管理系统"
-          />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button v-if="logeditShow" size="small" @click="logeditShow=false">
-            修改
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            保存
-          </el-button>
-          <el-button v-if="!logeditShow" size="small" @click="logeditShow=true">
-            取消
-          </el-button>
-        </el-col>
-      </el-col>
-      <el-col>
-        <el-col>地图</el-col>
-        <el-col :span="3" class="secondTitle">
-          采用地图：
-        </el-col>
-        <el-col :span="4" class="thirdTitle">
-          <el-select
-            v-model="listQuery.mapType"
-            size="small"
-            placeholder="请选择地图类型"
-            @change="mapChange"
-          >
-            <el-option
-              v-for="item in mapTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col v-if="maptypeShow" :span="4" class="thirdTitle">
-          <el-input v-model="listQuery.mapAddress" size="small" placeholder="请输入地图地址" />
-        </el-col>
-        <el-col :span="6" class="thirdTitle">
-          <el-button size="small" @click="buttonClick">
-            确定
-          </el-button>
-        </el-col>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { mapTypeSelect } from '@/api/systemConfig/mapConfig'
-export default {
-  name: 'ViewPcConfig',
-  data() {
-    return {
-      listQuery: {
-        mapType: '0',
-        mapAddress: ''
-      },
-      titleText: '',
-      logtitleText: '',
-      editShow: true,
-      logeditShow: true,
-      maptypeShow: false,
-      fileList1: [],
-      fileList2: [],
-      fileList3: [],
-      mapTypeList: [
-        {
-          label: '百度地图',
-          value: '0'
-        },
-        {
-          label: '高度地图',
-          value: '1'
-        },
-        {
-          label: '其他地图',
-          value: '2'
-        }
-      ]
-    }
-  },
-  methods: {
-    buttonClick() {
-      mapTypeSelect(this.listQuery).then(response => {
-        console.log(response)
-      })
-    },
-    mapChange(val) {
-      this.listQuery.mapAddress = ''
-      if (val === '2') {
-        this.maptypeShow = true
-      } else {
-        this.maptypeShow = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.secondTitle {
-  margin: 20px;
-}
-.thirdTitle {
-  margin: 14px 20px;
-}
-</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index c260c63..802c7ed 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,30 +1,390 @@
 <template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="PC端" name="first">
-      <view-pc-config />
-    </el-tab-pane>
-    <el-tab-pane label="APP端" name="second">
-      <view-app-config />
-    </el-tab-pane>
-  </el-tabs>
+  <app-container>
+    <el-row :gutter="4">
+      <!--左半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-s-platform" /></span>
+              <span>PC端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="12">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="hover">
+            <div class="heardStyle">
+              <span><i class="el-icon-mobile-phone" /></span>
+              <span>APP端</span>
+            </div>
+            <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>
+                  <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>
+                  </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>
+        </div>
+      </el-col>
+    </el-row>
+  </app-container>
 </template>
 
 <script>
-import viewPcConfig from './components/viewPcConfig'
-import viewAppConfig from './components/viewAppConfig'
-
 export default {
   name: 'ViewsConfig',
-  components: { viewPcConfig, viewAppConfig },
   data() {
     return {
-      activeName: 'first'
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
     }
   },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event)
+  watch: {
+    mapValue(val) {
+      if (val === '4') {
+        this.otherMapShow = true
+      }
     }
+  },
+  mounted() {
+  },
+  methods: {
+    titleUpData() {
+      this.titleDisabled = false
+    },
+    titleSure() {
+      this.titleDisabled = true
+    },
+    loginUpdata() {
+      this.loginDisabled = false
+    },
+    loginSure() {
+      this.loginDisabled = true
+    },
+    mapUpdata() {
+      this.mapDisabled = false
+    },
+    mapSure() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    },
+    mapCencel() {
+      this.mapDisabled = true
+      this.otherMapShow = false
+    }
+
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+  .heardStyle{
+    margin-bottom: 10px;
+  }
+  .heardStyle span{
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index ba278f3..96dcb84 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -3,20 +3,20 @@
     <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井名称" prop="wellName">
+          <el-form-item label="点位名称" prop="wellName">
             <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="井编号" prop="wellCode">
+          <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="wellForm.wellCode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="井类型" prop="wellType">
-            <el-select v-model="wellForm.wellType" placeholder="选择井类型" clearable>
+          <el-form-item label="点位类型" prop="wellType">
+            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -211,9 +211,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -244,14 +244,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -367,7 +367,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -411,9 +411,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
index b18edf3..89518c6 100644
--- a/src/views/wellManage/components/infoWindowWell.vue
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -9,7 +9,7 @@
       {{ wellInfo.wellCode }}
     </div>
     <div class="info-body">
-      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>点位类型：{{ wellInfo.wellTypeName }}</div>
       <div>权属单位：{{ wellInfo.deptName }}</div>
       <div>详细地址：{{ wellInfo.position }}</div>
     </div>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3c81745..6b29e8d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -4,19 +4,19 @@
       <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
+            <el-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -197,10 +197,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -275,10 +275,10 @@
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        wellTypeName: row.wellTypeName, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
+        wellTypeName: row.wellTypeName, // 点位类型
         bfztName: row.bfztName,
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
@@ -327,12 +327,13 @@
       }
       // 处理图片
       const urls = row.photos.split(';')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       for (const url of urls) {
         if (url) {
           this.imageList.push({ name: url, url: base_url + url })
         }
       }
+      console.log(this.imageList)
       // 获取井下监控数据
       this.listLoading = true
       watchDataByWell(row.id).then(response => {
@@ -340,6 +341,7 @@
         this.dataList = response.data
       })
     },
+    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       getAreaByDept(this.wellForm.deptid).then(response => {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 371b539..3aed2b7 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -4,20 +4,20 @@
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
+            <el-form-item label="点位名称" prop="wellName">
               <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
+            <el-form-item label="点位编号" prop="wellCode">
               <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+            <el-form-item label="点位类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择点位类型" clearable>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -228,9 +228,9 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -260,14 +260,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '点位编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '点位名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
@@ -374,9 +374,9 @@
       this.fetchWellType()
       this.wellForm = {
         id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
+        wellCode: row.wellCode, // 点位编号
+        wellName: row.wellName, // 点位名称
+        wellType: row.wellType, // 点位类型
         deptid: row.deptid, // 权属单位
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
@@ -418,7 +418,7 @@
         }
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index db958b7..4034581 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -4,17 +4,17 @@
       <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-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-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-form-item label="点位类型" prop="wellType">
               <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
             </el-form-item>
           </el-col>
@@ -95,10 +95,10 @@
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        wellTypeName: '', // 井类型名称
+        wellCode: '', // 点位编号
+        wellName: '', // 点位名称
+        wellType: '', // 点位类型
+        wellTypeName: '', // 点位类型名称
         deptid: '', // 权属单位
         deptName: '', // 权属单位名称
         bfztName: '', // 布防状态
@@ -151,10 +151,10 @@
         const row = response.data
         this.wellForm = {
           id: row.id, // 井id
-          wellCode: row.wellCode, // 井编号
-          wellName: row.wellName, // 井名称
-          wellType: row.wellType, // 井类型
-          wellTypeName: row.wellTypeName, // 井类型
+          wellCode: row.wellCode, // 点位编号
+          wellName: row.wellName, // 点位名称
+          wellType: row.wellType, // 点位类型
+          wellTypeName: row.wellTypeName, // 点位类型
           deptid: row.deptid, // 权属单位
           deptName: row.deptName, // 权属单位
           deep: row.deep, // 井深，
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index b6d1040..983f4bf 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -2,10 +2,10 @@
   <app-container>
     <search-area size="small" @search="search">
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号" clearable />
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.wellType" size="small" placeholder="选择井类型" clearable>
+        <el-select v-model="listQuery.wellType" size="small" placeholder="选择点位类型" clearable>
           <el-option
             v-for="item in wellTypeList"
             :key="item.value"
@@ -136,12 +136,12 @@
       }, // 筛选条件
       columns: [
         {
-          text: '井编号',
+          text: '点位编号',
           value: 'wellCode',
           align: 'center'
         },
         {
-          text: '井名称',
+          text: '点位名称',
           value: 'wellName',
           align: 'center'
         },
@@ -156,7 +156,7 @@
           align: 'center'
         },
         {
-          text: '井类型',
+          text: '点位类型',
           value: 'wellTypeName',
           align: 'center'
         },
@@ -180,8 +180,8 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      showWellType: true, // 是否显示井类型下拉
-      wellTypeList: null, // 井类型列表
+      showWellType: true, // 是否显示点位类型下拉
+      wellTypeList: null, // 点位类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -217,6 +217,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
+      console.log(row, '============++++')
       this.detailShow = true
       this.$refs.detailwell.initDialog(true, row)
     },
@@ -448,7 +449,7 @@
         this.listLoading = false
       })
     },
-    // 获取井类型
+    // 获取点位类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
diff --git a/src/views/wellManage/postionCorrectWell.vue b/src/views/wellManage/postionCorrectWell.vue
index eea298b..fd09fb9 100644
--- a/src/views/wellManage/postionCorrectWell.vue
+++ b/src/views/wellManage/postionCorrectWell.vue
@@ -38,7 +38,7 @@
       <!--搜索框-->
       <map-search-comp
         :list="resultList"
-        placeholder="井编号/名称/位置"
+        placeholder="点位编号/名称/位置"
         @search="search"
         @change-page="searchPageChange"
         @click-item="searchItemClick"
@@ -219,10 +219,10 @@
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
-      const hideWellIds = []// 要隐藏的井编号
+      const hideWellIds = []// 要隐藏的点位编号
       // 2. 整理查询条件
       const keywords = listQuery.keywords // 关键字
-      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 点位类型
       let deptids = [] // 所有权属
       if (listQuery.deptid) {
         deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
@@ -230,7 +230,7 @@
       // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
       for (const marker of this.markers) {
         let show = true
-        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配点位编号和位置
         if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
           show = false
         }
@@ -238,7 +238,7 @@
         if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
           show = false
         }
-        // 井类型不为空，且没有匹配成功
+        // 点位类型不为空，且没有匹配成功
         if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
           show = false
         }