diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,8 @@
     // 重置表单
     resetForm() {
       this.baseInfo = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0724edc..d2780e6 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"
@@ -117,7 +117,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="窨井维护机构" prop="responsibleDept">
+          <el-form-item label="井维护机构" prop="responsibleDept">
             <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
@@ -189,9 +189,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -222,14 +222,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ 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' }]
       },
@@ -285,8 +285,10 @@
       }
     }
   },
-  mounted: function() {
+  created: function() {
     this.fetchWellType()
+    this.imageList = []
+    this.fileList = []
   },
   methods: {
     // 加载组织机构树形下拉菜单
@@ -302,7 +304,7 @@
         }
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -346,9 +348,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -363,6 +365,7 @@
       // 清空上传图片
       this.$refs.upload.clearFiles()
       this.fileList = []
+      this.imageList = []
       this.hideUpload = this.fileList.length >= 4
       // 清除验证
       this.$nextTick(() => {
@@ -386,7 +389,7 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           addWell(this.wellForm).then(response => {
-            console.log('新增窨井')
+            console.log('新增井')
             if (response.code === 200) {
               this.$message.success('新增成功!')
               this.resetForm()

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0724edc..d2780e6 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"
@@ -117,7 +117,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="窨井维护机构" prop="responsibleDept">
+          <el-form-item label="井维护机构" prop="responsibleDept">
             <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
@@ -189,9 +189,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -222,14 +222,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ 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' }]
       },
@@ -285,8 +285,10 @@
       }
     }
   },
-  mounted: function() {
+  created: function() {
     this.fetchWellType()
+    this.imageList = []
+    this.fileList = []
   },
   methods: {
     // 加载组织机构树形下拉菜单
@@ -302,7 +304,7 @@
         }
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -346,9 +348,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -363,6 +365,7 @@
       // 清空上传图片
       this.$refs.upload.clearFiles()
       this.fileList = []
+      this.imageList = []
       this.hideUpload = this.fileList.length >= 4
       // 清除验证
       this.$nextTick(() => {
@@ -386,7 +389,7 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           addWell(this.wellForm).then(response => {
-            console.log('新增窨井')
+            console.log('新增井')
             if (response.code === 200) {
               this.$message.success('新增成功!')
               this.resetForm()
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index e0cf127..d2ff0a5 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,8 +77,9 @@
                 <i class="el-icon-plus"/>
               </el-upload>
               <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <!--<img width="100%" :src="dialogImageUrl">-->
                 <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto; height: 400px;">
+                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
                 </div>
               </el-dialog>
             </el-form-item>
@@ -235,12 +236,10 @@
       loading: true
     }
   },
-  activated() {
-    this.imageList = []
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
       this.loading = true
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0724edc..d2780e6 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"
@@ -117,7 +117,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="窨井维护机构" prop="responsibleDept">
+          <el-form-item label="井维护机构" prop="responsibleDept">
             <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
@@ -189,9 +189,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -222,14 +222,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ 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' }]
       },
@@ -285,8 +285,10 @@
       }
     }
   },
-  mounted: function() {
+  created: function() {
     this.fetchWellType()
+    this.imageList = []
+    this.fileList = []
   },
   methods: {
     // 加载组织机构树形下拉菜单
@@ -302,7 +304,7 @@
         }
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -346,9 +348,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -363,6 +365,7 @@
       // 清空上传图片
       this.$refs.upload.clearFiles()
       this.fileList = []
+      this.imageList = []
       this.hideUpload = this.fileList.length >= 4
       // 清除验证
       this.$nextTick(() => {
@@ -386,7 +389,7 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           addWell(this.wellForm).then(response => {
-            console.log('新增窨井')
+            console.log('新增井')
             if (response.code === 200) {
               this.$message.success('新增成功!')
               this.resetForm()
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index e0cf127..d2ff0a5 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,8 +77,9 @@
                 <i class="el-icon-plus"/>
               </el-upload>
               <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <!--<img width="100%" :src="dialogImageUrl">-->
                 <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto; height: 400px;">
+                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
                 </div>
               </el-dialog>
             </el-form-item>
@@ -235,12 +236,10 @@
       loading: true
     }
   },
-  activated() {
-    this.imageList = []
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
       this.loading = true
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8969dc8..df76dad 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -80,7 +80,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="1">
-
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -256,24 +255,19 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
-      return this.wellForm.deptid
-    },
     qu() { // 获取区
       return this.wellForm.qu
     }
   },
   watch: {
-    firstDept(val, oldVal) { // 监控权属单位变化
-      if (oldVal !== '') {
-        if (val !== '') {
-          this.wellForm.responsibleDept = ''
-          this.wellForm.responsibleDeptName = ''
-          this.wellForm.area = ''
-          this.wellForm.qu = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea1()
-        }
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
       } else {
         if (val !== '') {
           this.fetchSecondDeptTree()
@@ -391,6 +385,7 @@
     cancel() {
       this.dialogFormVisible = false
       this.imageList = []
+      this.wellForm.deptid = ''
       this.$emit('watchChild')
       // 清除验证
       this.$nextTick(() => {

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0724edc..d2780e6 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"
@@ -117,7 +117,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="窨井维护机构" prop="responsibleDept">
+          <el-form-item label="井维护机构" prop="responsibleDept">
             <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
@@ -189,9 +189,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -222,14 +222,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ 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' }]
       },
@@ -285,8 +285,10 @@
       }
     }
   },
-  mounted: function() {
+  created: function() {
     this.fetchWellType()
+    this.imageList = []
+    this.fileList = []
   },
   methods: {
     // 加载组织机构树形下拉菜单
@@ -302,7 +304,7 @@
         }
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -346,9 +348,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -363,6 +365,7 @@
       // 清空上传图片
       this.$refs.upload.clearFiles()
       this.fileList = []
+      this.imageList = []
       this.hideUpload = this.fileList.length >= 4
       // 清除验证
       this.$nextTick(() => {
@@ -386,7 +389,7 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           addWell(this.wellForm).then(response => {
-            console.log('新增窨井')
+            console.log('新增井')
             if (response.code === 200) {
               this.$message.success('新增成功!')
               this.resetForm()
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index e0cf127..d2ff0a5 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,8 +77,9 @@
                 <i class="el-icon-plus"/>
               </el-upload>
               <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <!--<img width="100%" :src="dialogImageUrl">-->
                 <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto; height: 400px;">
+                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
                 </div>
               </el-dialog>
             </el-form-item>
@@ -235,12 +236,10 @@
       loading: true
     }
   },
-  activated() {
-    this.imageList = []
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
       this.loading = true
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8969dc8..df76dad 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -80,7 +80,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="1">
-
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -256,24 +255,19 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
-      return this.wellForm.deptid
-    },
     qu() { // 获取区
       return this.wellForm.qu
     }
   },
   watch: {
-    firstDept(val, oldVal) { // 监控权属单位变化
-      if (oldVal !== '') {
-        if (val !== '') {
-          this.wellForm.responsibleDept = ''
-          this.wellForm.responsibleDeptName = ''
-          this.wellForm.area = ''
-          this.wellForm.qu = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea1()
-        }
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
       } else {
         if (val !== '') {
           this.fetchSecondDeptTree()
@@ -391,6 +385,7 @@
     cancel() {
       this.dialogFormVisible = false
       this.imageList = []
+      this.wellForm.deptid = ''
       this.$emit('watchChild')
       // 清除验证
       this.$nextTick(() => {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index ac1e41d..374190d 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -5,10 +5,10 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showWellType" class="selectForm-container-item" prop="wellType">
-            <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"
@@ -116,13 +116,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 130,
           align: 'center'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -165,8 +165,8 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      showWellType: true, // 是否显示窨井类型下拉
-      wellTypeList: null, // 窨井类型列表
+      showWellType: true, // 是否显示井类型下拉
+      wellTypeList: null, // 井类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -192,7 +192,7 @@
     }
   },
   created() {
-    this.fetchWellType()// 获取窨井列表
+    this.fetchWellType()// 获取井列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -212,17 +212,17 @@
         return true
       }
     },
-    // 新增窨井
+    // 新增井
     add() {
       this.$router.push({ path: 'addWell', query: { type: 'add' }})
     },
-    // 编辑窨井信息
+    // 编辑井信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.editwell.initDialog(this.dialogFormVisible, row)
     },
-    // 删除窨井
+    // 删除井
     del() {
       if (this.checkSelection()) {
         const wellIds = []
@@ -230,7 +230,7 @@
           wellIds.push(value.id)
         })
         this.$confirm(
-          '确定要删除所选窨井吗？',
+          '确定要删除所选井吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -249,7 +249,7 @@
         this.$message.error('至少选中一项')
       }
     },
-    // 批量导入窨井
+    // 批量导入井
     uploadFile(param) {
       console.log('uploadFile')
       // 判断文件大小是否符合要求
@@ -310,7 +310,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `窨井列表.xlsx` // 下载后文件名
+        downloadElement.download = `井列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
@@ -324,7 +324,7 @@
       if (row.bfzt === '1') {
         // 需要撤防
         this.$confirm(
-          '确定要对窨井进行撤防吗？',
+          '确定要对该井进行撤防吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -342,7 +342,7 @@
       } else {
         // 需要布防
         this.$confirm(
-          '确定要对窨井进行布防吗？',
+          '确定要对该井进行布防吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -371,7 +371,7 @@
         bfzt: '1'
       }
       this.$confirm(
-        '确定要对列表中的全部窨井进行布防吗？',
+        '确定要对列表中的全部井进行布防吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -399,7 +399,7 @@
         bfzt: '0'
       }
       this.$confirm(
-        '确定要对列表中的全部窨井进行撤防吗？',
+        '确定要对列表中的全部井进行撤防吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -419,7 +419,7 @@
     search() {
       this.fetchData(false)
     },
-    // 获取窨井数据
+    // 获取井数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
@@ -431,7 +431,7 @@
         this.listLoading = false
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []

diff --git a/config/index.js b/config/index.js
index fd2332c..da1b580 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,10 +48,10 @@
 
   build: {
     // Template for index.htmlru
-    index: path.resolve(__dirname, '../smartwell/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../smartwell'),
+    assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
 
     /**
@@ -61,7 +61,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwell/',
+    assetsPublicPath: '/smartwell_front/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index 0a353f1..bcc4cef 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://42.81.160.165:2021"',
+  BASE_API: '"http://111.198.10.15:11304"',
 }
diff --git a/package.json b/package.json
index 596b8c1..d2e7fd3 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.2.1",
-    "element-ui": "^2.12.0",
+    "element-themex": "^1.0.3",
+    "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -49,7 +50,7 @@
     "copy-webpack-plugin": "4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
-    "element-theme-chalk": "^2.12.0",
+    "element-theme-chalk": "^2.13.2",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.0.0",
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..6ef30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div id="app">
     <router-view/>
+    <audio id="eventAudio" src="" autoplay/>
   </div>
 </template>
 
diff --git a/src/api/configResponse.js b/src/api/configResponse.js
new file mode 100644
index 0000000..59b81bf
--- /dev/null
+++ b/src/api/configResponse.js
@@ -0,0 +1,19 @@
+/**
+ * 联系人配置接口
+ */
+import request from '@/utils/request'
+// 组织查询
+export function getDeptResponseList(params) {
+  return request({
+    url: '/config/deptResponsiblePersonList',
+    method: 'get',
+    params
+  })
+}
+export function setDeptResponse(params) {
+  return request({
+    url: '/config/responsiblePersonConfig',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/well.js b/src/api/well.js
index a7261ee..7251853 100644
--- a/src/api/well.js
+++ b/src/api/well.js
@@ -1,10 +1,10 @@
 /**
- * 窨井管理接口
+ * 井管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 窨井查询
+// 井查询
 export function getWellList(params) {
   return request({
     url: 'well/list',
@@ -12,7 +12,7 @@
     params
   })
 }
-// 获取窨井详情
+// 获取井详情
 export function getWellInfo(id) {
   return request({
     url: 'well/info',
@@ -23,7 +23,7 @@
   })
 }
 
-// 窨井类别
+// 井类别
 export function getWellType(params) {
   return request({
     url: 'dict/code/sluicewellType',
@@ -32,7 +32,7 @@
   })
 }
 
-// 添加窨井
+// 添加井
 export function addWell(params) {
   return request({
     url: 'well/add',
@@ -40,7 +40,7 @@
     params
   })
 }
-// 修改窨井
+// 修改井
 export function updateWell(params) {
   return request({
     url: 'well/update',
@@ -48,7 +48,7 @@
     params
   })
 }
-// 删除窨井
+// 删除井
 export function delWell(ids) {
   return request({
     url: 'well/delete',
@@ -114,7 +114,7 @@
     }
   })
 }
-// 窨井批量布防
+// 井批量布防
 export function batchBfcf(params) {
   return request({
     url: 'well/batchBfcf',
@@ -123,7 +123,7 @@
   })
 }
 
-// 根据布防状态统计窨井数量
+// 根据布防状态统计井数量
 export function wellCountByBfzt() {
   return request({
     url: 'well/countByBfzt',
@@ -131,7 +131,7 @@
   })
 }
 
-// 单个窨井查询
+// 单个井查询
 export function getWellOne(params) {
   return request({
     url: 'well/selectOne',
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 63c87c9..f87e54c 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -3,7 +3,7 @@
 import user from './user'
 const websocket = {
   state: {
-    wsUrl: 'ws://111.198.10.15:11307/websocket/',
+    wsUrl: 'ws://111.198.10.15:11304/websocket/',
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
@@ -44,6 +44,7 @@
         }
         // 监听socket消息接收
         socket.onmessage = function(msg) {
+          debugger
           // 转换为json对象
           const data = JSON.parse(msg.data)
           console.log(data)
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index d29d47a..3149b14 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>
@@ -100,8 +100,8 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       baseInfo: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
         deep: '', // 井深
         deviceType: '', // 设备类别
         deviceTypeName: '', // 设备类别
@@ -214,8 +214,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 d13e743..17673bd 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
@@ -86,13 +86,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center',
           type: 'Button'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index fe31090..60d5324 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -130,7 +130,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示窨井详情
+      wellShow: false // 是否显示井详情
     }
   },
   created() {
@@ -138,7 +138,7 @@
     this.fetchData()// 获取数据
   },
   methods: {
-    // 显示窨井详情
+    // 显示井详情
     showWellDetail(row) {
       this.wellShow = true
       this.$refs.wellInfo.initDialog(row.wellId)
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..83e3a85 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -1,5 +1,5 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <ve-pie :data="chartData" :extend="extend" :legend="legend" :title="title"/>
 </template>
 
 <script>
@@ -7,31 +7,33 @@
 
 export default {
   data() {
-    this.extend = {
-      series: {
-        label: { show: true, position: 'outside', formatter: '{b}:{c}' }
-      }
-    }
-    this.chartSettings = {
-      labelMap: {
-        'onlineStatus': '在线状态',
-        'deviceCount': '设备数量'
-      },
-      dimension: 'onlineStatus',
-      metrics: 'deviceCount'
-    }
-    this.title = {
-      text: '设备在线情况统计'
-    }
     return {
       chartData: {
         columns: ['onlineStatus', 'deviceCount'],
         rows: []
+      },
+      title: {
+        text: '设备在线情况统计'
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}:{c}' }
+        }
+      },
+      chartSettings: {
+        labelMap: {
+          'onlineStatus': '在线状态',
+          'deviceCount': '设备数量'
+        },
+        dimension: 'onlineStatus',
+        metrics: 'deviceCount'
+      },
+      legend: {
+        right: 10
       }
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..775af19 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 3145470..97cdfdb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 a80e470..e6a795c 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 35cd0d8..2fead0e 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,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 01fda73..45cf40b 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -5,7 +5,7 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
@@ -87,7 +87,7 @@
           align: 'center'
         },
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           align: 'center'
         },
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 5697cfe..054b6a6 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -5,7 +5,7 @@
       <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.wellCode" placeholder="窨井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item>
             <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
@@ -57,8 +57,8 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定窨井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
-        <p>使用方法：请在上方输入框中输入要查询的完整的窨井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
         <el-image
@@ -101,9 +101,9 @@
   },
   methods: {
     search() {
-      // 验证窨井编号不能为空
+      // 验证井编号不能为空
       if (this.listQuery.wellCode === '') {
-        this.$message.error('窨井编号不能为空')
+        this.$message.error('井编号不能为空')
         return
       }
       // 验证设备类型
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 09a6e62..76e575b 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -294,6 +294,8 @@
             } else {
               this.canEdit = true
             }
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index be81b66..1d32c39 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index bbbdf63..39d76af 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -226,6 +226,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 373e5fa..5438e80 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -254,6 +254,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index a1da5c4..5221d29 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -267,6 +267,8 @@
               this.dialogFormVisible = false
             }
             this.canEdit = false
+          }).catch(_ => {
+            this.canEdit = true
           })
         }
       })
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2fb6228..46ed775 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -49,7 +49,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>
@@ -98,7 +98,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'] }]
@@ -225,9 +225,13 @@
     // 获取设备型号
     fetchDeviceType() {
       getDeviceType().then(response => {
-        this.deviceTypeList = response.data
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
         }
       })
     },
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index c7b553d..746a416 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 85b5318..b0f2d59 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -43,7 +43,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 96c2ffd..d98309d 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>智能窨井监测管理系统</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -36,7 +35,8 @@
   data() {
     return {
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png'), // 头部图片
     }
   },
   computed: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f927608..2ad3996 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -99,7 +99,9 @@
       loading: false,
       pwdType: 'password',
       redirect: '/',
-      showKaptcha: false
+      showKaptcha: false,
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..b3199b7 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -239,7 +239,7 @@
         }
       }).catch(error => {
         loading.close() // 关闭加载动画
-        this.$message.error(error.message)
+        // this.$message.error(error.message)
       })
       this.fileList = []
     },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index df08f76..0ccb0d9 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -389,7 +389,7 @@
             this.alarmList.push(alarm)
           }
         }
-      }else{ //如果没有直接等于alarmListOri
+      }else { // 如果没有直接等于alarmListOri
         this.alarmList = this.alarmListOri
       }
       if (center.length > 0) {
@@ -532,6 +532,7 @@
             centerys.sort()
             const index = Math.floor(centerxs.length / 2)
             this.center = [centerxs[index], centerys[index]]
+            console.log('总数据数：'+this.markers.length)
             if (this.type === 'massMarkers' && this.showAll) {
               this.mountMassMarker() // 加载海量点
             } else if (this.type === 'cluster' && this.showAll) {
@@ -794,7 +795,8 @@
       background-color: pink;
     }
     .info-window{
-      max-width: 250px;
+      max-width: 260px;
+      min-width:200px;
       /*background-color: lightcyan;*/
       .info-header{
         padding: 10px 10px 5px 10px;
diff --git a/src/views/overview/overview_old.vue b/src/views/overview/overview_old.vue
index 3137d98..6da3555 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"
@@ -22,7 +22,7 @@
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-button v-show="showClearBtn" class="filter-item" @click="clearSearch">清除查询</el-button>
           <el-form-item style="margin-left:10px">
-            <el-checkbox v-model="showAll">显示全部窨井</el-checkbox>
+            <el-checkbox v-model="showAll">显示全部井</el-checkbox>
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,7 +61,7 @@
     <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :amap-manager="aMapManager" :zoom="zoom" vid="overview" class="map-demo">
-        <!--窨井marker-->
+        <!--井marker-->
         <!--<el-amap-marker-->
         <!--v-for="(marker,index) in markers"-->
         <!--:key="'well'+marker.wellId"-->
@@ -145,7 +145,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 100,
           align: 'center'
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 7247058..2428ad4 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -150,11 +150,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index e9e5304..7517edb 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -132,11 +132,14 @@
     },
     // 查询数据
     search() {
-      this.fetchData()
+      this.fetchData(false)
     },
     // 获取日志数据
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getLoginLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index b00d606..e90069d 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -43,11 +43,11 @@
               <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </el-row>
             <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
               <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="roleAssign">角色分配</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
               <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
             </el-row>
@@ -74,7 +74,7 @@
               <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="60">
+          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" width="80">
             <template slot-scope="scope">
               <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
             </template>
@@ -363,7 +363,7 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
index a1d39b1..d89da5f 100644
--- a/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editCOLevel.vue
@@ -74,11 +74,11 @@
     const validateHighValue = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写0~2000以内的数字'))
+          callback(new Error('请填写0~100以内的数字'))
         } else {
           const float = parseFloat(value)
           if (float > 100) {
-            callback(new Error('请填写0~2000以内的数字'))
+            callback(new Error('请填写100以内的数字'))
           }
           callback()
         }
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 60d7d54..9d7538a 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -114,7 +114,7 @@
       showDeviceType: true,
       listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      wellShow: false, // 是否显示窨井详情
+      wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
     }
   },
diff --git a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
index 93bc404..6b4b2ff 100644
--- a/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/editResponsibleUser.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { getUserList } from '@/api/user'
+import { setDeptResponse } from '@/api/configResponse'
 
 export default {
   name: 'EditResponsibleUser',
@@ -97,7 +98,16 @@
         deptid: this.form.deptid,
         user: row.id
       }
-      console.log(form)
+      setDeptResponse(form).then(response => {
+        if (response.code === 200) {
+          this.$message.success('设置成功')
+          this.cancel()
+          this.$emit('watchChild')
+        }
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
     }
   }
 }
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index 15cc4de..9c414b0 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -27,7 +27,7 @@
 
 import treeTable from '@/components/TreeTable'
 import editDept from '@/views/system/dept/editdept'
-import { getDeptList, delDept } from '@/api/dept'
+import { getDeptResponseList } from '@/api/configResponse'
 import { toTreeList } from '@/utils/structure'
 import EditResponsibleUser from './editResponsibleUser'
 
@@ -45,16 +45,16 @@
       },
       columns: [
         {
-          text: '组织机构简称',
+          text: '组织名称',
           value: 'simplename'
         },
         {
           text: '联系人',
-          value: 'user'
+          value: 'userName'
         },
         {
           text: '联系电话',
-          value: 'tips'
+          value: 'phone'
         }
       ],
       list: [],
@@ -81,43 +81,46 @@
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
-      this.$refs.editdept.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editdept.initDialog(this.dialogFormVisible, row)
     },
-    del(row) {
-      this.$confirm(
-        '确定要删除' + row.simplename + '吗？',
-        '确认删除',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
-        })
-      })
-    },
+    // del(row) {
+    //   this.$confirm(
+    //     '确定要删除' + row.simplename + '吗？',
+    //     '确认删除',
+    //     {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     }
+    //   ).then(() => {
+    //     delDept(row.id).then(response => {
+    //       if (response.code === 200) {
+    //         this.$message.success('删除成功')
+    //         this.fetchData()
+    //         // deleteItem(this.list, row)// 前端删除指定项
+    //       }
+    //     })
+    //   })
+    // },
     search() {
       this.fetchData()
     },
     fetchData() {
       console.log('fetchData')
       this.listLoading = true
-      getDeptList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
-        this.list = this.list[0].children
-        // this.list = response.data.list
+      getDeptResponseList(this.listQuery).then(response => {
+        this.list = toTreeList(response.data, '0', false)
+        if (this.list[0].id === '0') { // 如果有顶级，去掉
+          this.list = this.list[0].children
+        } else {
+          this.list = this.list
+        }
         this.listLoading = false
       })
     },
     // 在嵌套列表list中删除指定元素
     deleteItem(des) {
-      // deleteItem(this.list, des)
+      // deleteIftem(this.list, des)
       const del = (list, item) => {
         for (const i in list) {
           if (list[i].id === des.id) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 0724edc..d2780e6 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"
@@ -117,7 +117,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
-          <el-form-item label="窨井维护机构" prop="responsibleDept">
+          <el-form-item label="井维护机构" prop="responsibleDept">
             <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
@@ -189,9 +189,9 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       wellForm: {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -222,14 +222,14 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        wellCode: [{ required: true, message: '窨井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '窨井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ 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' }]
       },
@@ -285,8 +285,10 @@
       }
     }
   },
-  mounted: function() {
+  created: function() {
     this.fetchWellType()
+    this.imageList = []
+    this.fileList = []
   },
   methods: {
     // 加载组织机构树形下拉菜单
@@ -302,7 +304,7 @@
         }
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
@@ -346,9 +348,9 @@
     // 重置表单
     resetForm() {
       this.wellForm = {
-        wellCode: '', // 窨井编号
-        wellName: '', // 窨井名称
-        wellType: '', // 窨井类型
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
         deptid: '', // 权属单位
         deep: '', // 井深，
         position: '', // 位置描述
@@ -363,6 +365,7 @@
       // 清空上传图片
       this.$refs.upload.clearFiles()
       this.fileList = []
+      this.imageList = []
       this.hideUpload = this.fileList.length >= 4
       // 清除验证
       this.$nextTick(() => {
@@ -386,7 +389,7 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           addWell(this.wellForm).then(response => {
-            console.log('新增窨井')
+            console.log('新增井')
             if (response.code === 200) {
               this.$message.success('新增成功!')
               this.resetForm()
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index e0cf127..d2ff0a5 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,8 +77,9 @@
                 <i class="el-icon-plus"/>
               </el-upload>
               <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <!--<img width="100%" :src="dialogImageUrl">-->
                 <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto; height: 400px;">
+                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
                 </div>
               </el-dialog>
             </el-form-item>
@@ -235,12 +236,10 @@
       loading: true
     }
   },
-  activated() {
-    this.imageList = []
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
       this.loading = true
       this.dialogFormVisible = dialogFormVisible
       this.wellForm = {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8969dc8..df76dad 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -80,7 +80,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="1">
-
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -256,24 +255,19 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
-      return this.wellForm.deptid
-    },
     qu() { // 获取区
       return this.wellForm.qu
     }
   },
   watch: {
-    firstDept(val, oldVal) { // 监控权属单位变化
-      if (oldVal !== '') {
-        if (val !== '') {
-          this.wellForm.responsibleDept = ''
-          this.wellForm.responsibleDeptName = ''
-          this.wellForm.area = ''
-          this.wellForm.qu = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea1()
-        }
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
       } else {
         if (val !== '') {
           this.fetchSecondDeptTree()
@@ -391,6 +385,7 @@
     cancel() {
       this.dialogFormVisible = false
       this.imageList = []
+      this.wellForm.deptid = ''
       this.$emit('watchChild')
       // 清除验证
       this.$nextTick(() => {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index ac1e41d..374190d 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -5,10 +5,10 @@
       <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-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item v-if="showWellType" class="selectForm-container-item" prop="wellType">
-            <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"
@@ -116,13 +116,13 @@
       }, // 筛选条件
       columns: [
         {
-          text: '窨井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 130,
           align: 'center'
         },
         {
-          text: '窨井名称',
+          text: '井名称',
           value: 'wellName',
           align: 'center'
         },
@@ -165,8 +165,8 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      showWellType: true, // 是否显示窨井类型下拉
-      wellTypeList: null, // 窨井类型列表
+      showWellType: true, // 是否显示井类型下拉
+      wellTypeList: null, // 井类型列表
       deptProps: {
         parent: 'pid',
         value: 'id',
@@ -192,7 +192,7 @@
     }
   },
   created() {
-    this.fetchWellType()// 获取窨井列表
+    this.fetchWellType()// 获取井列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -212,17 +212,17 @@
         return true
       }
     },
-    // 新增窨井
+    // 新增井
     add() {
       this.$router.push({ path: 'addWell', query: { type: 'add' }})
     },
-    // 编辑窨井信息
+    // 编辑井信息
     edit(row) {
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.editwell.initDialog(this.dialogFormVisible, row)
     },
-    // 删除窨井
+    // 删除井
     del() {
       if (this.checkSelection()) {
         const wellIds = []
@@ -230,7 +230,7 @@
           wellIds.push(value.id)
         })
         this.$confirm(
-          '确定要删除所选窨井吗？',
+          '确定要删除所选井吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -249,7 +249,7 @@
         this.$message.error('至少选中一项')
       }
     },
-    // 批量导入窨井
+    // 批量导入井
     uploadFile(param) {
       console.log('uploadFile')
       // 判断文件大小是否符合要求
@@ -310,7 +310,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `窨井列表.xlsx` // 下载后文件名
+        downloadElement.download = `井列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
@@ -324,7 +324,7 @@
       if (row.bfzt === '1') {
         // 需要撤防
         this.$confirm(
-          '确定要对窨井进行撤防吗？',
+          '确定要对该井进行撤防吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -342,7 +342,7 @@
       } else {
         // 需要布防
         this.$confirm(
-          '确定要对窨井进行布防吗？',
+          '确定要对该井进行布防吗？',
           '确认操作',
           {
             confirmButtonText: '确定',
@@ -371,7 +371,7 @@
         bfzt: '1'
       }
       this.$confirm(
-        '确定要对列表中的全部窨井进行布防吗？',
+        '确定要对列表中的全部井进行布防吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -399,7 +399,7 @@
         bfzt: '0'
       }
       this.$confirm(
-        '确定要对列表中的全部窨井进行撤防吗？',
+        '确定要对列表中的全部井进行撤防吗？',
         '确认操作',
         {
           confirmButtonText: '确定',
@@ -419,7 +419,7 @@
     search() {
       this.fetchData(false)
     },
-    // 获取窨井数据
+    // 获取井数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
@@ -431,7 +431,7 @@
         this.listLoading = false
       })
     },
-    // 获取窨井类型
+    // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
         this.wellTypeList = []
diff --git a/static/manifest.json b/static/manifest.json
new file mode 100644
index 0000000..6534d6b
--- /dev/null
+++ b/static/manifest.json
@@ -0,0 +1,3 @@
+{
+  "systemName":"智能窨井监测管理系统"
+}