diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/data.js b/src/api/data.js
index 264dc56..7376ad7 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -25,6 +25,7 @@
   return request({
     url: 'welldata/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/data.js b/src/api/data.js
index 264dc56..7376ad7 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -25,6 +25,7 @@
   return request({
     url: 'welldata/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/well.js b/src/api/well.js
index 5cc656b..8aee60d 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 备注类别
+export function getNotesType(params) {
+  return request({
+    url: 'dict/code/notesType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加闸井
 export function addWell(params) {
   return request({

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/data.js b/src/api/data.js
index 264dc56..7376ad7 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -25,6 +25,7 @@
   return request({
     url: 'welldata/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/well.js b/src/api/well.js
index 5cc656b..8aee60d 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 备注类别
+export function getNotesType(params) {
+  return request({
+    url: 'dict/code/notesType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加闸井
 export function addWell(params) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index d29b533..5703eaf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,6 +214,12 @@
         meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] }
       },
       {
+        path: '/wellStatocs',
+        name: 'wellStatics',
+        component: () => import('@/views/wellStatics/wellStatics'),
+        meta: { title: '闸井统计', icon: 'icon-config', permission: ['/well/statics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/data.js b/src/api/data.js
index 264dc56..7376ad7 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -25,6 +25,7 @@
   return request({
     url: 'welldata/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/well.js b/src/api/well.js
index 5cc656b..8aee60d 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 备注类别
+export function getNotesType(params) {
+  return request({
+    url: 'dict/code/notesType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加闸井
 export function addWell(params) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index d29b533..5703eaf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,6 +214,12 @@
         meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] }
       },
       {
+        path: '/wellStatocs',
+        name: 'wellStatics',
+        component: () => import('@/views/wellStatics/wellStatics'),
+        meta: { title: '闸井统计', icon: 'icon-config', permission: ['/well/statics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index e347e99..80e38c8 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑闸井" append-to-body @close="cancel">
+  <el-dialog :visible.sync="dialogFormVisible" class="editWellDialog" title="编辑闸井" append-to-body @close="cancel">
     <el-scrollbar :native="false">
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
             <el-form-item label="闸井名称" prop="wellName">
-              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填"/>
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
@@ -17,7 +17,7 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="闸井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择闸井类型" clearable>
+              <el-select v-model="wellForm.wellType" placeholder="点击选择闸井类型" clearable disabled>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -27,94 +27,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="所属派出所" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
+            <el-form-item label="备注" prop="notes">
+              <el-select v-model="wellForm.notes" placeholder="点击选择备注" clearable>
+                <el-option
+                  v-for="item in notesTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="产权单位">
-              <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{hide:hideUpload}"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card">
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">区/县</el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">街道/镇</el-col>
-          </el-form-item>
-
-        </el-row>
-        <el-row>
           <el-col :span="15">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model.trim="wellForm.position" type="text" placeholder="必填"/>
@@ -122,20 +46,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="13">
-            <el-form-item label="闸井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
-                <el-option
-                  v-for="item in secondDeptTreeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"/>
-              </el-select>
-              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
             <el-button size="medium" @click="cancel"> 取消</el-button>
             <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存</el-button>
@@ -151,7 +61,7 @@
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/dept'
 import { getAreaList, getAreaByDept } from '@/api/area'
-import { getWellType, updateWell } from '@/api/well'
+import { getWellType, updateWell, getNotesType } from '@/api/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -186,28 +96,6 @@
         callback(new Error('位置不能为空'))
       }
     }
-    const validateLng = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('经度不能为空'))
-      }
-    }
-    const validateLat = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('纬度不能为空'))
-      }
-    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
@@ -218,8 +106,6 @@
         deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
-        coordinateX: '', // 经度
-        coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
@@ -238,6 +124,7 @@
       imageList: [],
       secondDeptTreeList: [], // 二级组织树列表
       wellTypeList: [],
+      notesTypeList: [],
       quList: [],
       jiedaoList: [],
       textMap: {
@@ -249,9 +136,6 @@
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
-        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
-        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '所属派出所必选', trigger: 'change' }],
         wellType: [{ required: true, message: '闸井类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
@@ -296,6 +180,7 @@
   },
   mounted: function() {
     this.fetchWellType()
+    this.fetchNotesType()
     this.imageList = []
   },
   methods: {
@@ -313,8 +198,6 @@
         deptid: row.deptid, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
-        coordinateX: row.coordinateX, // 经度
-        coordinateY: row.coordinateY, // 纬度
         photos: row.photos, // 照片路径
         notes: row.notes, // 备注,
         qu: row.qu,
@@ -323,21 +206,7 @@
         responsibleDeptName: row.responsibleDeptName, // 维护人员部门
         owner: row.owner // 产权单位
       }
-      if (row.deptid && row.deptid !== '') {
-        this.fetchArea1(row.deptid)
-        this.fetchArea2()
-        this.fetchSecondDeptTree()
-        this.loading = false
-      }
-      // 处理图片
-      const base_url = process.env.BASE_API + '/static/'
-      const urls = row.photos.split(';')
-      for (const url of urls) {
-        if (url) {
-          this.imageList.push({ name: url, url: base_url + url })
-        }
-      }
-      this.handleChange(null, this.imageList)
+      this.loading = false
     },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
@@ -367,6 +236,12 @@
         }
       })
     },
+    // 获取备注类型
+    fetchNotesType() {
+      getNotesType().then(response => {
+        this.notesTypeList = response.data
+      })
+    },
     // 获取区域1
     fetchArea1(deptid) {
       getAreaByDept(this.wellForm.deptid).then(response => {
@@ -396,22 +271,6 @@
     },
     // 保存数据
     saveData: function() {
-      this.wellForm.photos = ''
-      if (this.wellForm.responsibleDept === '') {
-        if (this.secondDeptTreeList.length > 0) {
-          this.$message.warning('必须选择维护机构')
-          return
-        } else {
-          this.wellForm.responsibleDept = this.wellForm.deptid
-        }
-      }
-      for (const image of this.imageList) {
-        let index = image.url.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.wellForm.photos += image.url.substring(index) + ';'
-      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           updateWell(this.wellForm).then(response => {
@@ -496,14 +355,14 @@
     display: none;
   }
 
-  .editDialog {
+  .editWellDialog {
     .el-dialog {
-      width: 900px;
+      width: 700px;
       margin-top: 10vh !important;
       .el-dialog__body {
       }
       .el-scrollbar {
-        height: 410px;
+        height: 300px;
         width: 100%;
       }
       .el-scrollbar__wrap {

diff --git a/config/dev.env.js b/config/dev.env.js
index 9f671cf..e4d1bb4 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,8 +8,8 @@
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
   // BASE_API: '"http://106.74.146.218:2031"'
-  // BASE_API: '"http://192.168.0.212:14537"'
-  BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  BASE_API: '"http://192.168.0.212:8083"'
+  // BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://119.254.103.80:14537"'
+  // BASE_API: '"http://192.168.0.244:8083"'
 })
diff --git a/config/index.js b/config/index.js
index 113c70f..62e96dc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@
     proxyTable: {},
 
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     //是否自动打开浏览器
     autoOpenBrowser: true,
diff --git a/config/prod.env.js b/config/prod.env.js
index 488d501..2889ff7 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://192.168.0.212:8083"'
   BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/api/alarm.js b/src/api/alarm.js
index 9357263..6a8bc10 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -46,6 +46,7 @@
   return request({
     url: 'alarm/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/data.js b/src/api/data.js
index 264dc56..7376ad7 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -25,6 +25,7 @@
   return request({
     url: 'welldata/export',
     method: 'get',
+    timeout: 60000,
     params,
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
diff --git a/src/api/well.js b/src/api/well.js
index 5cc656b..8aee60d 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 备注类别
+export function getNotesType(params) {
+  return request({
+    url: 'dict/code/notesType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加闸井
 export function addWell(params) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index d29b533..5703eaf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,6 +214,12 @@
         meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] }
       },
       {
+        path: '/wellStatocs',
+        name: 'wellStatics',
+        component: () => import('@/views/wellStatics/wellStatics'),
+        meta: { title: '闸井统计', icon: 'icon-config', permission: ['/well/statics'] }
+      },
+      {
         path: '/alarmStatics',
         name: 'AlarmStatics',
         component: () => import('@/views/alarmStatics/alarmStatics'),
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index e347e99..80e38c8 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -1,11 +1,11 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑闸井" append-to-body @close="cancel">
+  <el-dialog :visible.sync="dialogFormVisible" class="editWellDialog" title="编辑闸井" append-to-body @close="cancel">
     <el-scrollbar :native="false">
       <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
         <el-row>
           <el-col :span="10">
             <el-form-item label="闸井名称" prop="wellName">
-              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填"/>
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
@@ -17,7 +17,7 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="闸井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择闸井类型" clearable>
+              <el-select v-model="wellForm.wellType" placeholder="点击选择闸井类型" clearable disabled>
                 <el-option
                   v-for="item in wellTypeList"
                   :key="item.value"
@@ -27,94 +27,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="所属派出所" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
+            <el-form-item label="备注" prop="notes">
+              <el-select v-model="wellForm.notes" placeholder="点击选择备注" clearable>
+                <el-option
+                  v-for="item in notesTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="产权单位">
-              <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{hide:hideUpload}"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card">
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">区/县</el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">街道/镇</el-col>
-          </el-form-item>
-
-        </el-row>
-        <el-row>
           <el-col :span="15">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model.trim="wellForm.position" type="text" placeholder="必填"/>
@@ -122,20 +46,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="13">
-            <el-form-item label="闸井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
-                <el-option
-                  v-for="item in secondDeptTreeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"/>
-              </el-select>
-              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
             <el-button size="medium" @click="cancel"> 取消</el-button>
             <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存</el-button>
@@ -151,7 +61,7 @@
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/dept'
 import { getAreaList, getAreaByDept } from '@/api/area'
-import { getWellType, updateWell } from '@/api/well'
+import { getWellType, updateWell, getNotesType } from '@/api/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 
@@ -186,28 +96,6 @@
         callback(new Error('位置不能为空'))
       }
     }
-    const validateLng = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('经度不能为空'))
-      }
-    }
-    const validateLat = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('纬度不能为空'))
-      }
-    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
@@ -218,8 +106,6 @@
         deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
-        coordinateX: '', // 经度
-        coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
@@ -238,6 +124,7 @@
       imageList: [],
       secondDeptTreeList: [], // 二级组织树列表
       wellTypeList: [],
+      notesTypeList: [],
       quList: [],
       jiedaoList: [],
       textMap: {
@@ -249,9 +136,6 @@
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
         position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
-        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
-        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '所属派出所必选', trigger: 'change' }],
         wellType: [{ required: true, message: '闸井类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
@@ -296,6 +180,7 @@
   },
   mounted: function() {
     this.fetchWellType()
+    this.fetchNotesType()
     this.imageList = []
   },
   methods: {
@@ -313,8 +198,6 @@
         deptid: row.deptid, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
-        coordinateX: row.coordinateX, // 经度
-        coordinateY: row.coordinateY, // 纬度
         photos: row.photos, // 照片路径
         notes: row.notes, // 备注,
         qu: row.qu,
@@ -323,21 +206,7 @@
         responsibleDeptName: row.responsibleDeptName, // 维护人员部门
         owner: row.owner // 产权单位
       }
-      if (row.deptid && row.deptid !== '') {
-        this.fetchArea1(row.deptid)
-        this.fetchArea2()
-        this.fetchSecondDeptTree()
-        this.loading = false
-      }
-      // 处理图片
-      const base_url = process.env.BASE_API + '/static/'
-      const urls = row.photos.split(';')
-      for (const url of urls) {
-        if (url) {
-          this.imageList.push({ name: url, url: base_url + url })
-        }
-      }
-      this.handleChange(null, this.imageList)
+      this.loading = false
     },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
@@ -367,6 +236,12 @@
         }
       })
     },
+    // 获取备注类型
+    fetchNotesType() {
+      getNotesType().then(response => {
+        this.notesTypeList = response.data
+      })
+    },
     // 获取区域1
     fetchArea1(deptid) {
       getAreaByDept(this.wellForm.deptid).then(response => {
@@ -396,22 +271,6 @@
     },
     // 保存数据
     saveData: function() {
-      this.wellForm.photos = ''
-      if (this.wellForm.responsibleDept === '') {
-        if (this.secondDeptTreeList.length > 0) {
-          this.$message.warning('必须选择维护机构')
-          return
-        } else {
-          this.wellForm.responsibleDept = this.wellForm.deptid
-        }
-      }
-      for (const image of this.imageList) {
-        let index = image.url.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.wellForm.photos += image.url.substring(index) + ';'
-      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           updateWell(this.wellForm).then(response => {
@@ -496,14 +355,14 @@
     display: none;
   }
 
-  .editDialog {
+  .editWellDialog {
     .el-dialog {
-      width: 900px;
+      width: 700px;
       margin-top: 10vh !important;
       .el-dialog__body {
       }
       .el-scrollbar {
-        height: 410px;
+        height: 300px;
         width: 100%;
       }
       .el-scrollbar__wrap {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 46a8558..396bfbe 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -4,9 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-          <!--<el-input v-model.trim="listQuery.keywords" placeholder="闸井编号" clearable/>-->
-          <!--</el-form-item>-->
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号" clearable/>
+          </el-form-item>
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.position" placeholder="闸井位置" clearable/>
           </el-form-item>
@@ -25,6 +25,15 @@
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="notesType">
+            <el-select v-model="listQuery.notes" placeholder="选择备注类型" clearable>
+              <el-option
+                v-for="item in notesTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.name"/>
+            </el-select>
+          </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
       </el-form>
@@ -103,7 +112,7 @@
 import editWell from '@/views/wellManage/editWell'
 import detailWell from '@/views/wellManage/detailWell'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getWellList, getWellType, delWell, batchImportWell, batchExportWell, batchBfcf, bfcf } from '@/api/well'
+import { getWellList, getWellType, getNotesType, delWell, batchImportWell, batchExportWell, batchBfcf, bfcf } from '@/api/well'
 import DeptSelect from '@/components/DeptSelect'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 
@@ -118,6 +127,7 @@
         owner: '', // 权属单位
         wellType: '', // 井类型
         deptid: '', // deptid
+        notes: '', // 备注类型
         offset: 1,
         limit: 20,
         sort: 'wellCode',
@@ -131,12 +141,6 @@
           align: 'center'
         },
         {
-          text: '闸井名称',
-          value: 'wellName',
-          width: 100,
-          align: 'center'
-        },
-        {
           text: '产权单位',
           value: 'owner',
           align: 'center'
@@ -164,6 +168,11 @@
           type: 'Button'
         },
         {
+          text: '备注',
+          value: 'notes',
+          align: 'center'
+        },
+        {
           text: '布防状态',
           value: 'bfztName',
           width: 80,
@@ -174,7 +183,8 @@
       list: [], // 列表数据
       total: 0, // 数据总数
       showWellType: true, // 是否显示闸井类型下拉
-      wellTypeList: null, // 闸井类型列表
+      wellTypeList: [], // 闸井类型列表
+      notesTypeList: [], // 备注类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -201,6 +211,7 @@
   },
   created() {
     this.fetchWellType()// 获取闸井列表
+    this.fetchNotesType() // 获取备注类别
     this.fetchData()// 获取数据
   },
   activated() {
@@ -305,6 +316,7 @@
         position: this.listQuery.position,
         wellType: this.listQuery.wellType,
         deptid: this.listQuery.deptid,
+        notes: this.listQuery.notes,
         bfzt: '1'
       }
       this.$confirm(
@@ -332,6 +344,7 @@
         position: this.listQuery.position,
         wellType: this.listQuery.wellType,
         deptid: this.listQuery.deptid,
+        notes: this.listQuery.notes,
         bfzt: '0'
       }
       this.$confirm(
@@ -441,6 +454,12 @@
         }
       })
     },
+    // 获取备注类型
+    fetchNotesType() {
+      getNotesType().then(response => {
+        this.notesTypeList = response.data
+      })
+    },
     // 去设备列表页
     goDeviceList(row) {
       this.$router.push({ name: 'DeviceList', query: { wellCode: row.wellCode }})