diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index e2f5127..48d13ca 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -58,13 +58,13 @@
       path: '/bizLog',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
       name: 'BusinessLog',
-      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+      meta: { title: '业务日志', permission: ['/sys/log/biz/list'] }
     },
     {
       path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
       name: 'ErrorLog',
-      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
+      meta: { title: '异常日志', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index e2f5127..48d13ca 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -58,13 +58,13 @@
       path: '/bizLog',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
       name: 'BusinessLog',
-      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+      meta: { title: '业务日志', permission: ['/sys/log/biz/list'] }
     },
     {
       path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
       name: 'ErrorLog',
-      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
+      meta: { title: '异常日志', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8cc8546..02630c2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -115,11 +115,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          // TODO: 记得更换2.0接口
-          // if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            // commit('SET_ROLELIST', data.roleIds)
-            commit('SET_ROLELIST', data.roleList)
+          if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLELIST', data.roleIds)
             commit('SET_ROLENAMES', data.roleNames)
             commit('SET_ROLETIPS', data.roleTips)
           } else {

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index e2f5127..48d13ca 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -58,13 +58,13 @@
       path: '/bizLog',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
       name: 'BusinessLog',
-      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+      meta: { title: '业务日志', permission: ['/sys/log/biz/list'] }
     },
     {
       path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
       name: 'ErrorLog',
-      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
+      meta: { title: '异常日志', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8cc8546..02630c2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -115,11 +115,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          // TODO: 记得更换2.0接口
-          // if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            // commit('SET_ROLELIST', data.roleIds)
-            commit('SET_ROLELIST', data.roleList)
+          if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLELIST', data.roleIds)
             commit('SET_ROLENAMES', data.roleNames)
             commit('SET_ROLETIPS', data.roleTips)
           } else {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f62cae9..918c857 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -140,10 +140,10 @@
 }
 
 .table-container{
-  background-color: $tableTitleColor !important;
-  border-top: 12px solid #ebebeb !important;
+  background-color: #ffffff;
+  //border-top: 12px solid #ebebeb !important;
   .table-title{
-    background-color:#fff;
+    background-color: $tableTitleColor !important;
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index e2f5127..48d13ca 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -58,13 +58,13 @@
       path: '/bizLog',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
       name: 'BusinessLog',
-      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+      meta: { title: '业务日志', permission: ['/sys/log/biz/list'] }
     },
     {
       path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
       name: 'ErrorLog',
-      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
+      meta: { title: '异常日志', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8cc8546..02630c2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -115,11 +115,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          // TODO: 记得更换2.0接口
-          // if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            // commit('SET_ROLELIST', data.roleIds)
-            commit('SET_ROLELIST', data.roleList)
+          if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLELIST', data.roleIds)
             commit('SET_ROLENAMES', data.roleNames)
             commit('SET_ROLETIPS', data.roleTips)
           } else {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f62cae9..918c857 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -140,10 +140,10 @@
 }
 
 .table-container{
-  background-color: $tableTitleColor !important;
-  border-top: 12px solid #ebebeb !important;
+  background-color: #ffffff;
+  //border-top: 12px solid #ebebeb !important;
   .table-title{
-    background-color:#fff;
+    background-color: $tableTitleColor !important;
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index d8e287e..2cb0075 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -26,7 +26,7 @@
 
 // table
 $tableTitleHeight:46px;
-$tableTitleColor:#fff;
+$tableTitleColor: #f4f4f4;
 $tableTitleText:#606266;
 
 // the :export directive is the magic sauce for webpack

diff --git a/mock/biz/overview.js b/mock/biz/overview.js
index 84a78a0..b34a8bd 100644
--- a/mock/biz/overview.js
+++ b/mock/biz/overview.js
@@ -181,7 +181,7 @@
     }
   },
   {
-    url: 'dict/code/sluicewellType',
+    url: 'sys/dict/code/sluicewellType',
     type: 'get',
     response: _ => {
       return {
diff --git a/public/config/project.config.json b/public/config/project.config.json
index 87492f9..9091be3 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "智能窨井管理系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11304/",
+  "baseUrl": "http://111.198.10.15:11309/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/App.vue b/src/App.vue
index d9046c1..3320e88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
         bodyHeight -= el_navbar ? el_navbar[0].clientHeight : 48
       }
       // 减去2个padding
-      // bodyHeight -= 20
+      bodyHeight -= 20
       store.dispatch('settings/ChangeHeight', bodyHeight)
     }
   }
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index 37f7c3e..13a3dea 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -14,7 +14,7 @@
 // 告警类别
 export function getAlarmType(params) {
   return request({
-    url: 'dict/code/alarmType',
+    url: 'sys/dict/code/alarmType',
     method: 'get',
     params
   })
diff --git a/src/api/alarm/job.js b/src/api/alarm/job.js
index 1ec49a2..674830b 100644
--- a/src/api/alarm/job.js
+++ b/src/api/alarm/job.js
@@ -6,7 +6,7 @@
 // 查询工单状态
 export function getJobStatus(params) {
   return request({
-    url: 'dict/code/jobStatus',
+    url: 'sys/dict/code/jobStatus',
     method: 'get',
     params
   })
diff --git a/src/api/device/concentrator.js b/src/api/device/concentrator.js
index 9013bdf..542b221 100644
--- a/src/api/device/concentrator.js
+++ b/src/api/device/concentrator.js
@@ -65,7 +65,7 @@
 // 在线状态
 export function getStatusType(params) {
   return request({
-    url: 'dict/code/onlineStatus',
+    url: 'sys/dict/code/onlineStatus',
     method: 'get',
     params
   })
diff --git a/src/api/systemOld/area.js b/src/api/systemOld/area.js
index 974ce81..20b3c04 100644
--- a/src/api/systemOld/area.js
+++ b/src/api/systemOld/area.js
@@ -42,7 +42,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/log.js b/src/api/systemOld/log.js
index af6429f..1940b45 100644
--- a/src/api/systemOld/log.js
+++ b/src/api/systemOld/log.js
@@ -34,7 +34,7 @@
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/resource.js b/src/api/systemOld/resource.js
index bd57641..d80b29c 100644
--- a/src/api/systemOld/resource.js
+++ b/src/api/systemOld/resource.js
@@ -31,7 +31,7 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
diff --git a/src/api/systemOld/role.js b/src/api/systemOld/role.js
index 6bc63e4..c7f80ba 100644
--- a/src/api/systemOld/role.js
+++ b/src/api/systemOld/role.js
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }
diff --git a/src/api/well/well.js b/src/api/well/well.js
index 7251853..c7beaa8 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -26,7 +26,7 @@
 // 井类别
 export function getWellType(params) {
   return request({
-    url: 'dict/code/sluicewellType',
+    url: '/sys/dict/code/sluicewellType',
     method: 'get',
     params
   })
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 136152d..37e5258 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -108,6 +108,8 @@
   .search-div{
     padding:12px;
     padding-bottom: 2px; /* 本身输入框有10px下边距*/
+    padding-left:0px;
+    padding-top: 2px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
diff --git a/src/main.js b/src/main.js
index 303cb2a..5131944 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
 import { setWsUrl } from './utils/auth'
 
 // 是否需要mock 不需要注掉下面两行
-const { mockXHR } = require('../mock')
-mockXHR()
+// const { mockXHR } = require('../mock')
+// mockXHR()
 
 // 引入动画
 import animated from 'animate.css'
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index e2f5127..48d13ca 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -58,13 +58,13 @@
       path: '/bizLog',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
       name: 'BusinessLog',
-      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+      meta: { title: '业务日志', permission: ['/sys/log/biz/list'] }
     },
     {
       path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
       name: 'ErrorLog',
-      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
+      meta: { title: '异常日志', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8cc8546..02630c2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -115,11 +115,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          // TODO: 记得更换2.0接口
-          // if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            // commit('SET_ROLELIST', data.roleIds)
-            commit('SET_ROLELIST', data.roleList)
+          if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLELIST', data.roleIds)
             commit('SET_ROLENAMES', data.roleNames)
             commit('SET_ROLETIPS', data.roleTips)
           } else {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f62cae9..918c857 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -140,10 +140,10 @@
 }
 
 .table-container{
-  background-color: $tableTitleColor !important;
-  border-top: 12px solid #ebebeb !important;
+  background-color: #ffffff;
+  //border-top: 12px solid #ebebeb !important;
   .table-title{
-    background-color:#fff;
+    background-color: $tableTitleColor !important;
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index d8e287e..2cb0075 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -26,7 +26,7 @@
 
 // table
 $tableTitleHeight:46px;
-$tableTitleColor:#fff;
+$tableTitleColor: #f4f4f4;
 $tableTitleText:#606266;
 
 // the :export directive is the magic sauce for webpack
diff --git a/src/utils/request.js b/src/utils/request.js
index 9ce2ab2..02dcee1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,20 +39,19 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        // 开发完页面以后下面的这个注释需要打开
-        // MessageBox.confirm(
-        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
-        //   '确定登出',
-        //   {
-        //     confirmButtonText: '重新登录',
-        //     cancelButtonText: '取消',
-        //     type: 'warning'
-        //   }
-        // ).then(() => {
-        //   store.dispatch('FedLogOut').then(() => {
-        //     location.reload() // 为了重新实例化vue-router对象 避免bug
-        //   })
-        // })
+        MessageBox.confirm(
+          '你已被登出，可以取消继续留在该页面，或者重新登录',
+          '确定登出',
+          {
+            confirmButtonText: '重新登录',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          store.dispatch('FedLogOut').then(() => {
+            location.reload() // 为了重新实例化vue-router对象 避免bug
+          })
+        })
       } else {
         Message({
           showClose: true,