diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -88,7 +88,7 @@
 // 角色类型列表
 export function getDataScopeTypeList() {
   return request({
-    url: 'dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     method: 'get'
   })
 }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 635acf7..e7b5d51 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -55,19 +55,19 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       getResourceListByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 635acf7..e7b5d51 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -55,19 +55,19 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       getResourceListByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index eb6ff09..6dfd64d 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -9,23 +9,23 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/role/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/role/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="250" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/role/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/role/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="hasPerm('/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
               功能权限
             </el-button>
-            <el-button v-if="hasPerm('/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
               数据权限
             </el-button>
           </template>
@@ -49,16 +49,10 @@
 import dataPerm from '@/views/system/role/dataPerm'
 import { getRoleList, delRole } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListRole',
   components: {
-    SearchItem,
-    SearchArea,
-    AppContainer,
     treeTable,
     functionPerm,
     dataPerm,
@@ -86,7 +80,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/role/update') || this.hasPerm('/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
+      return this.hasPerm('/sys/role/update') || this.hasPerm('/sys/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
     }
   },
   created() {
@@ -104,7 +98,7 @@
       this.dialogFormVisible = true
       this.editShow = true
       console.log('row:' + row)
-      this.$refs.editrole.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editrole.initDialog(this.dialogStatus, row)
     },
     del(row) {
       this.$confirm(
@@ -131,9 +125,7 @@
       console.log('fetchData')
       this.listLoading = true
       getRoleList(this.listQuery).then(response => {
-        // console.log(response.data.list)
-        this.list = toTreeList(response.data.list)
-        console.log(this.list)
+        this.list = toTreeList(response.data)
         this.listLoading = false
       })
     },
@@ -154,13 +146,13 @@
     funcPermission(row) {
       this.dialogFormVisible = true
       this.functionShow = true
-      this.$refs.funcperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.funcperm.initDialog(row)
     },
     // 数据权限配置
     dataPermission(row) {
       this.dialogFormVisible = true
       this.dataShow = true
-      this.$refs.dataperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.dataperm.initDialog(row)
     }
   }
 }

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 635acf7..e7b5d51 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -55,19 +55,19 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       getResourceListByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index eb6ff09..6dfd64d 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -9,23 +9,23 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/role/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/role/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="250" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/role/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/role/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="hasPerm('/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
               功能权限
             </el-button>
-            <el-button v-if="hasPerm('/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
               数据权限
             </el-button>
           </template>
@@ -49,16 +49,10 @@
 import dataPerm from '@/views/system/role/dataPerm'
 import { getRoleList, delRole } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListRole',
   components: {
-    SearchItem,
-    SearchArea,
-    AppContainer,
     treeTable,
     functionPerm,
     dataPerm,
@@ -86,7 +80,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/role/update') || this.hasPerm('/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
+      return this.hasPerm('/sys/role/update') || this.hasPerm('/sys/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
     }
   },
   created() {
@@ -104,7 +98,7 @@
       this.dialogFormVisible = true
       this.editShow = true
       console.log('row:' + row)
-      this.$refs.editrole.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editrole.initDialog(this.dialogStatus, row)
     },
     del(row) {
       this.$confirm(
@@ -131,9 +125,7 @@
       console.log('fetchData')
       this.listLoading = true
       getRoleList(this.listQuery).then(response => {
-        // console.log(response.data.list)
-        this.list = toTreeList(response.data.list)
-        console.log(this.list)
+        this.list = toTreeList(response.data)
         this.listLoading = false
       })
     },
@@ -154,13 +146,13 @@
     funcPermission(row) {
       this.dialogFormVisible = true
       this.functionShow = true
-      this.$refs.funcperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.funcperm.initDialog(row)
     },
     // 数据权限配置
     dataPermission(row) {
       this.dialogFormVisible = true
       this.dataShow = true
-      this.$refs.dataperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.dataperm.initDialog(row)
     }
   }
 }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index e9709b2..d22cd09 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -45,8 +45,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="重复密码" prop="repassword">
-            <el-input v-model.trim="userForm.repassword" type="password" placeholder="必填" />
+          <el-form-item label="重复密码" prop="rePassword">
+            <el-input v-model.trim="userForm.rePassword" type="password" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -60,9 +60,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
+          <el-form-item label="组织机构" prop="deptId">
+            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
+            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -108,8 +108,8 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        if (this.userForm.rePassword !== '') {
+          this.$refs.dataForm.validateField('rePassword')
         }
         callback()
       }
@@ -133,10 +133,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '', // 重复密码
+        rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
       deptProps: {
@@ -172,8 +172,8 @@
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         password: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
-        repassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
         email: [{
           required: false, // 是否必填
@@ -207,9 +207,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -226,14 +226,14 @@
           name: row.name, // 姓名
           email: row.email, // 邮箱，
           phone: row.phone, // 手机号，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           roleid: row.roleid, // 角色
           birthday: row.birthday, // 生日
           sex: row.sex // 性别
         }
         this.roleName = row.roleName
         delete this.userForm['password']
-        delete this.userForm['repassword']
+        delete this.userForm['rePassword']
       }
     },
     // 加载角色树形下拉菜单
@@ -255,10 +255,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '' // 重复密码
+        rePassword: '' // 重复密码
       }
     },
     // 保存数据
@@ -275,6 +275,7 @@
         console.log(this.userForm)
         const userForm = JSON.parse(JSON.stringify(this.userForm))
         userForm.password = RSAencrypt(userForm.password)
+        userForm.rePassword = RSAencrypt(userForm.rePassword)
         if (valid) {
           this.btnLoading = true
           addUser(userForm).then(response => {

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 635acf7..e7b5d51 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -55,19 +55,19 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       getResourceListByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index eb6ff09..6dfd64d 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -9,23 +9,23 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/role/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/role/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="250" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/role/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/role/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="hasPerm('/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
               功能权限
             </el-button>
-            <el-button v-if="hasPerm('/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
               数据权限
             </el-button>
           </template>
@@ -49,16 +49,10 @@
 import dataPerm from '@/views/system/role/dataPerm'
 import { getRoleList, delRole } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListRole',
   components: {
-    SearchItem,
-    SearchArea,
-    AppContainer,
     treeTable,
     functionPerm,
     dataPerm,
@@ -86,7 +80,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/role/update') || this.hasPerm('/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
+      return this.hasPerm('/sys/role/update') || this.hasPerm('/sys/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
     }
   },
   created() {
@@ -104,7 +98,7 @@
       this.dialogFormVisible = true
       this.editShow = true
       console.log('row:' + row)
-      this.$refs.editrole.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editrole.initDialog(this.dialogStatus, row)
     },
     del(row) {
       this.$confirm(
@@ -131,9 +125,7 @@
       console.log('fetchData')
       this.listLoading = true
       getRoleList(this.listQuery).then(response => {
-        // console.log(response.data.list)
-        this.list = toTreeList(response.data.list)
-        console.log(this.list)
+        this.list = toTreeList(response.data)
         this.listLoading = false
       })
     },
@@ -154,13 +146,13 @@
     funcPermission(row) {
       this.dialogFormVisible = true
       this.functionShow = true
-      this.$refs.funcperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.funcperm.initDialog(row)
     },
     // 数据权限配置
     dataPermission(row) {
       this.dialogFormVisible = true
       this.dataShow = true
-      this.$refs.dataperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.dataperm.initDialog(row)
     }
   }
 }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index e9709b2..d22cd09 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -45,8 +45,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="重复密码" prop="repassword">
-            <el-input v-model.trim="userForm.repassword" type="password" placeholder="必填" />
+          <el-form-item label="重复密码" prop="rePassword">
+            <el-input v-model.trim="userForm.rePassword" type="password" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -60,9 +60,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
+          <el-form-item label="组织机构" prop="deptId">
+            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
+            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -108,8 +108,8 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        if (this.userForm.rePassword !== '') {
+          this.$refs.dataForm.validateField('rePassword')
         }
         callback()
       }
@@ -133,10 +133,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '', // 重复密码
+        rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
       deptProps: {
@@ -172,8 +172,8 @@
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         password: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
-        repassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
         email: [{
           required: false, // 是否必填
@@ -207,9 +207,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -226,14 +226,14 @@
           name: row.name, // 姓名
           email: row.email, // 邮箱，
           phone: row.phone, // 手机号，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           roleid: row.roleid, // 角色
           birthday: row.birthday, // 生日
           sex: row.sex // 性别
         }
         this.roleName = row.roleName
         delete this.userForm['password']
-        delete this.userForm['repassword']
+        delete this.userForm['rePassword']
       }
     },
     // 加载角色树形下拉菜单
@@ -255,10 +255,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '' // 重复密码
+        rePassword: '' // 重复密码
       }
     },
     // 保存数据
@@ -275,6 +275,7 @@
         console.log(this.userForm)
         const userForm = JSON.parse(JSON.stringify(this.userForm))
         userForm.password = RSAencrypt(userForm.password)
+        userForm.rePassword = RSAencrypt(userForm.rePassword)
         if (valid) {
           this.btnLoading = true
           addUser(userForm).then(response => {
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1338588..fb77ecb 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -3,12 +3,12 @@
     <el-row>
       <!--左半部分-->
       <el-col :span="5">
-        <div class="deptScroll" style="width:90%;">
-          <el-card class="box-card">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll">
+            <el-scrollbar class="user-dept-scroll" ref="deptScroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -44,19 +44,19 @@
           </search-item>
           <template slot="btns">
             <div style="margin-bottom: 10px;">
-              <el-button v-if="hasPerm('/mgr/add')" size="small" type="primary" icon="el-icon-plus" @click="add">
+              <el-button v-if="hasPerm('/sys/mgr/add')" size="small" type="primary" icon="el-icon-plus" @click="add">
                 新增
               </el-button>
-              <el-button v-if="hasPerm('/mgr/update')" size="small" type="primary" icon="el-icon-edit" @click="edit">
+              <el-button v-if="hasPerm('/sys/mgr/update')" size="small" type="primary" icon="el-icon-edit" @click="edit">
                 修改
               </el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" size="small" type="primary" icon="el-icon-delete" @click="del">
+              <el-button v-if="hasPerm('/sys/mgr/delete')" size="small" type="primary" icon="el-icon-delete" @click="del">
                 删除
               </el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" size="small" type="primary" icon="el-icon-key" @click="resetPwd">
+              <el-button v-if="hasPerm('/sys/mgr/reset')" size="small" type="primary" icon="el-icon-key" @click="resetPwd">
                 重置密码
               </el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" size="small" type="primary" icon="el-icon-magic-stick" @click="roleAssign">
+              <el-button v-if="hasPerm('/sys/mgr/roleAssign')" size="small" type="primary" icon="el-icon-magic-stick" @click="roleAssign">
                 角色分配
               </el-button>
             </div>
@@ -65,7 +65,7 @@
         <!--查询结果Table显示-->
         <normal-table ref="normalTable" class="table" :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" size="small" @change="changePage">
           <template slot="preColumns">
-            <el-table-column label="选择" width="50" header-align="center" align="center">
+            <el-table-column label="选择" width="55" header-align="center" align="center">
               <template slot-scope="scope">
                 <el-radio v-model="radio" :label="scope.$index" class="radio">
                   &nbsp;
@@ -82,9 +82,9 @@
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" align="center" width="70">
+            <el-table-column v-if="hasPerm('/sys/mgr/freeze')" label="操作" align="center" width="70">
               <template slot-scope="scope">
-                <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">
+                <el-button v-if="hasPerm('/sys/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">
                   {{ btnNames[scope.row.statusName] }}
                 </el-button>
               </template>
@@ -95,6 +95,7 @@
     </el-row>
     <!--编辑用户的对话框-->
     <edit-user v-show="editShow" ref="edituser" @watchChild="fetchData" />
+    <!--配置角色对话框-->
     <role-assign v-show="roleAssignShow" ref="roleassign" @watchChild="fetchData" />
   </div>
 </template>
@@ -121,7 +122,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        deptid: '',
+        deptId: '',
         offset: 1,
         limit: 20,
         sort: 'id'
@@ -140,31 +141,12 @@
         '启用': 'primary'
       },
       columns: [
-        {
-          text: '账号',
-          value: 'account'
-        },
-        {
-          text: '所在组织机构',
-          value: 'deptName',
-          width: 150
-        },
-        {
-          text: '真实姓名',
-          value: 'name'
-        },
-        {
-          text: '角色',
-          value: 'roleName'
-        },
-        {
-          text: '手机号',
-          value: 'phone'
-        },
-        {
-          text: '注册日期',
-          value: 'createtime'
-        }
+        { text: '账号', value: 'account' },
+        { text: '所在组织机构', value: 'deptName', width: 150 },
+        { text: '真实姓名', value: 'name' },
+        { text: '角色', value: 'roleName' },
+        { text: '手机号', value: 'phone' },
+        { text: '注册日期', value: 'createtime' }
       ],
       list: [],
       total: 0,
@@ -175,7 +157,6 @@
       },
       treeLoading: false,
       listLoading: false,
-      dialogFormVisible: false,
       dialogStatus: '',
       editShow: false, // 编辑组件是否显示
       roleAssignShow: false, // 角色分配组件是否显示
@@ -202,18 +183,16 @@
     // 打开新增对话框
     add() {
       this.dialogStatus = 'create'
-      this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.edituser.initDialog(this.dialogStatus, this.dialogFormVisible)
+      this.$refs.edituser.initDialog(this.dialogStatus)
     },
     // 打开修改对话框
     edit() {
       if (this.singleCheck()) {
         this.dialogStatus = 'update'
-        this.dialogFormVisible = true
         this.editShow = true
         const row = this.list[this.radio]
-        this.$refs.edituser.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+        this.$refs.edituser.initDialog(this.dialogStatus, row)
       } else {
         this.$message.error('必须选中一项')
       }
@@ -221,10 +200,9 @@
     // 打开角色分配对话框
     roleAssign() {
       if (this.singleCheck()) {
-        this.dialogFormVisible = true
         this.roleAssignShow = true
         const row = this.list[this.radio]
-        this.$refs.roleassign.initDialog(this.dialogFormVisible, row)
+        this.$refs.roleassign.initDialog(row)
       } else {
         this.$message.error('必须选中一项')
       }
@@ -245,7 +223,7 @@
           delUser(row.id).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
-              this.deleteItem(this.list, row)// 前端删除指定项
+              this.fetchData()
             }
           })
         })
@@ -343,13 +321,13 @@
     fetchDeptTree() {
       this.treeLoading = true
       getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = toTreeList(response.data, '0', true)
         this.treeLoading = false
       })
     },
     // 点击左侧组织结构项触发
     handleNodeClick(data) {
-      this.listQuery.deptid = data.id
+      this.listQuery.deptId = data.id
       this.fetchData()
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -382,41 +360,33 @@
         return true
       }
     }
-
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .form-container{
-    margin-bottom: 20px;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .el-date-editor{
-    .el-range-separator{
-      width: 7% !important;
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 265px);
+        .filter-tree{
+
+        }
+      }
     }
   }
-  .el-range-separator{
-    width: 7% !important;
-  }
-  .el-scrollbar{
-    min-height: calc(100vh - 260px);
-    max-height: calc(100vh - 170px);
-  }
   .table{
     min-height: calc(100vh - 265px);
   }
 </style>
 <style>
-  .deptScroll .el-scrollbar__wrap{
-    overflow-x: hidden;
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
     background-color: #fff;
     padding: 0px;
   }
+
 </style>

diff --git a/package-lock.json b/package-lock.json
index 63c2f82..21d24ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3502,6 +3502,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6114,6 +6119,14 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "element-resize-detector": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz",
+      "integrity": "sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==",
+      "requires": {
+        "batch-processor": "1.0.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.5",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
@@ -13956,6 +13969,15 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
diff --git a/package.json b/package.json
index defa84a..f835d2d 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "mock": "^0.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "svg-sprite-loader": "^6.0.9",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/public/config/project.config.json b/public/config/project.config.json
index bc1f26c..ca10ddf 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:11409/",
+  "baseUrl": "http://192.168.8.101:11410/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "provinceCode":"360000",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..2332cd2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
 // 模板下载
 export function downloadTemplate(fileName) {
   return request({
-    url: 'template/download',
+    url: 'sys/template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +19,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'sys/imageUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/login.js b/src/api/login.js
index ab56344..2a3ea5b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,22 +2,22 @@
 // 登录
 export function login(loginForm) {
   return request({
-    url: '/user/login',
+    url: 'sys/user/login',
     method: 'post',
-    params: loginForm
+    data: loginForm
   })
 }
 // 获取用户信息
 export function getInfo() {
   return request({
-    url: '/user/info',
+    url: 'sys/user/info',
     method: 'get'
   })
 }
 // 获取用户权限（菜单、按钮）
 export function getMenus(params) {
   return request({
-    url: '/user/permission',
+    url: 'sys/user/permission',
     method: 'get',
     params
   })
@@ -25,21 +25,21 @@
 // 登出
 export function logout() {
   return request({
-    url: '/user/logout',
+    url: 'sys/user/logout',
     method: 'get'
   })
 }
 // 获取系统基础配置：公钥，验证码是否开启
 export function getConfig() {
   return request({
-    url: '/config/baseConfig',
+    url: 'sys/config/baseConfig',
     method: 'get'
   })
 }
 // 获取验证码图片
 export function getKaptcha(sid) {
   return request({
-    url: '/kaptcha/base64',
+    url: 'sys/kaptcha/base64',
     method: 'get',
     params: {
       sid
diff --git a/src/api/server.js b/src/api/server.js
deleted file mode 100644
index 51c3f45..0000000
--- a/src/api/server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-// 获取服务列表
-export function getServerList(params) {
-  return request({
-    url: '/map/server/listPage',
-    method: 'get',
-    params: params
-  })
-}
-// 编辑服务地址
-export function serverEdit(params) {
-  return request({
-    url: '/map/server/edit',
-    method: 'post',
-    params: params
-  })
-}
diff --git a/src/api/system/area.js b/src/api/system/area.js
index ee118ec..3b16832 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -5,7 +5,7 @@
 // 区域查询
 export function getAreaListPage(params) {
   return request({
-    url: 'area/listPage',
+    url: 'sys/area/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
-    url: 'config/getAreaByDept',
+    url: 'sys/config/getAreaByDept',
     method: 'get',
     params: {
       deptId: deptid
@@ -24,7 +24,7 @@
 // 区域查询
 export function getAreaList(pid) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params: {
       pid: pid
@@ -35,7 +35,7 @@
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
   return request({
-    url: 'area/list',
+    url: 'sys/area/list',
     method: 'get',
     params
   })
@@ -43,33 +43,33 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
 
 // 添加区域
-export function addArea(params) {
+export function addArea(data) {
   return request({
-    url: 'area/add',
+    url: 'sys/area/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改区域机构
-export function updateArea(params) {
+export function updateArea(data) {
   return request({
-    url: 'area/update',
+    url: 'sys/area/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除区域机构
 export function delArea(id) {
   return request({
-    url: 'area/delete',
+    url: 'sys/area/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index ae3dd22..33b8cb2 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -5,7 +5,7 @@
 // 组织查询
 export function getDeptList(params) {
   return request({
-    url: 'dept/list',
+    url: 'sys/dept/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 组织机构树列表
 export function getDeptTreeList(params) {
   return request({
-    url: 'dept/tree',
+    url: 'sys/dept/tree',
     method: 'get',
     params
   })
@@ -22,9 +22,9 @@
 // 组织机构树列表
 export function getDeptTreeListByPid(pid) {
   return request({
-    url: 'dept/listByPid',
+    url: 'sys/dept/listByPid',
     method: 'get',
-    data: {
+    params: {
       pid: pid
     }
   })
@@ -32,7 +32,7 @@
 // 根据角色获取组织机构树列表
 export function getDeptTreeByRole(roleId) {
   return request({
-    url: 'role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     method: 'get',
     params: {
       roleId
@@ -41,27 +41,27 @@
 }
 
 // 添加组织机构
-export function addDept(params) {
+export function addDept(data) {
   return request({
-    url: 'dept/add',
+    url: 'sys/dept/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织机构
-export function updateDept(params) {
+export function updateDept(data) {
   return request({
-    url: 'dept/update',
+    url: 'sys/dept/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织机构
 export function delDept(id) {
   return request({
-    url: 'dept/delete',
+    url: 'sys/dept/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a0e6a24..689b6b1 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -5,34 +5,34 @@
 // 字典查询
 export function getDictList(params) {
   return request({
-    url: 'dict/listPage',
+    url: 'sys/dict/listPage',
     method: 'get',
     params
   })
 }
 
 // 添加字典
-export function addDict(params) {
+export function addDict(data) {
   return request({
-    url: 'dict/add',
+    url: 'sys/dict/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改字典机构
-export function updateDict(params) {
+export function updateDict(data) {
   return request({
-    url: 'dict/update',
+    url: 'sys/dict/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除字典机构
 export function delDict(id) {
   return request({
-    url: 'dict/delete',
+    url: 'sys/dict/delete',
     method: 'post',
-    params: {
+    data: {
       dictId: id
     }
   })
@@ -40,7 +40,7 @@
 // 获取字典值列表
 export function getDictByCode(params) {
   return request({
-    url: 'dict/code/' + params,
+    url: 'sys/dict/code/' + params,
     method: 'get'
   })
 }
diff --git a/src/api/system/log.js b/src/api/system/log.js
index 1dbb3a3..58ad81d 100644
--- a/src/api/system/log.js
+++ b/src/api/system/log.js
@@ -2,33 +2,56 @@
  * 日志管理接口
  */
 import request from '@/utils/request'
-// 日志查询
-export function getLogList(params) {
+// 操作日志查询
+export function getBizLogList(params) {
   return request({
-    url: 'log/list',
-    method: 'post',
+    url: 'sys/log/biz/list',
+    method: 'get',
     params
   })
 }
-// 日志查询
-export function getLogDetail(id) {
+// 操作日志详情
+export function getBizLogDetail(id) {
   return request({
-    url: 'log/detail/' + id,
+    url: 'sys/log/biz/detail/' + id,
+    method: 'get'
+  })
+}
+// 异常日志查询
+export function getErrorLogList(params) {
+  return request({
+    url: 'sys/log/error/list',
+    method: 'get',
+    params
+  })
+}
+// 异常日志详情
+export function getErrorLogDetail(id) {
+  return request({
+    url: 'sys/log/error/detail/' + id,
     method: 'get'
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'dict/code/logType',
+    url: 'sys/dict/code/logType',
     method: 'get'
   })
 }
 
-// 删除日志
+// 删除业务日志
 export function delLog() {
   return request({
-    url: 'log/delLog',
+    url: 'sys/log/biz/delLog',
+    method: 'post'
+  })
+}
+
+// 删除异常日志
+export function delErrorLog() {
+  return request({
+    url: 'sys/log/error/delLog',
     method: 'post'
   })
 }
@@ -36,7 +59,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'loginLog/list',
+    url: 'sys/loginLog/list',
     method: 'get',
     params
   })
@@ -44,7 +67,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'loginLog/delLoginLog',
+    url: 'sys/loginLog/delLoginLog',
     method: 'post'
   })
 }
diff --git a/src/api/system/resource.js b/src/api/system/resource.js
index bd57641..277f48f 100644
--- a/src/api/system/resource.js
+++ b/src/api/system/resource.js
@@ -5,7 +5,7 @@
 // 资源查询
 export function getResourceList(params) {
   return request({
-    url: 'resource/list',
+    url: 'sys/resource/list',
     method: 'get',
     params
   })
@@ -13,7 +13,7 @@
 // 资源查询
 export function getResourceListByRole(roleId) {
   return request({
-    url: 'resource/treeListByRoleId',
+    url: 'sys/resource/treeListByRoleId',
     method: 'get',
     params: {
       roleId: roleId
@@ -23,7 +23,7 @@
 // 资源树列表
 export function getResourceTreeList() {
   return request({
-    url: 'resource/tree',
+    url: 'sys/resource/tree',
     method: 'get'
   })
 }
@@ -31,33 +31,33 @@
 // 资源类型列表
 export function getResourceTypeList() {
   return request({
-    url: 'dict/code/resourceType',
+    url: 'sys/dict/code/resourceType',
     method: 'get'
   })
 }
 
 // 添加资源
-export function addResource(params) {
+export function addResource(data) {
   return request({
-    url: 'resource/add',
+    url: 'sys/resource/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改资源
-export function updateResource(params) {
+export function updateResource(data) {
   return request({
-    url: 'resource/update',
+    url: 'sys/resource/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除资源
 export function delResource(id) {
   return request({
-    url: 'resource/delete',
+    url: 'sys/resource/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 6bc63e4..df6aee3 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -6,7 +6,7 @@
 // 角色查询
 export function getRoleList(params) {
   return request({
-    url: 'role/list',
+    url: 'sys/role/list',
     method: 'get',
     params
   })
@@ -14,14 +14,14 @@
 // 角色机构树列表
 export function getRoleTreeList() {
   return request({
-    url: 'role/tree',
+    url: 'sys/role/tree',
     method: 'get'
   })
 }
 // 根据用户获取角色机构树列表
 export function getRoleTreeListByUser(userId) {
   return request({
-    url: 'role/treeByUserId',
+    url: 'sys/role/treeByUserId',
     method: 'get',
     params: {
       userId: userId
@@ -30,27 +30,27 @@
 }
 
 // 添加角色机构
-export function addRole(params) {
+export function addRole(data) {
   return request({
-    url: 'role/add',
+    url: 'sys/role/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改角色机构
-export function updateRole(params) {
+export function updateRole(data) {
   return request({
-    url: 'role/update',
+    url: 'sys/role/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除角色机构
 export function delRole(id) {
   return request({
-    url: 'role/delete',
+    url: 'sys/role/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -59,9 +59,9 @@
 // 功能授权
 export function funcAuthor(roleId, ids) {
   return request({
-    url: 'role/funcAuthor',
+    url: 'sys/role/funcAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -73,9 +73,9 @@
 // 数据授权
 export function dataAuthor(roleId, ids) {
   return request({
-    url: 'role/dataAuthor',
+    url: 'sys/role/dataAuthor',
     method: 'post',
-    params: {
+    data: {
       roleId: roleId,
       ids: ids
     },
@@ -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/system/user.js b/src/api/system/user.js
index 02a38d0..006b484 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -7,34 +7,34 @@
 // 用户查询
 export function getUserList(params) {
   return request({
-    url: 'mgr/list',
-    method: 'post',
+    url: 'sys/mgr/list',
+    method: 'get',
     params
   })
 }
 
 // 添加用户
-export function addUser(params) {
+export function addUser(data) {
   return request({
-    url: 'mgr/add',
+    url: 'sys/mgr/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改用户
-export function updateUser(params) {
+export function updateUser(data) {
   return request({
-    url: 'mgr/update',
+    url: 'sys/mgr/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除用户
 export function delUser(id) {
   return request({
-    url: 'mgr/delete',
+    url: 'sys/mgr/delete',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -43,9 +43,9 @@
 // 冻结用户
 export function freezeUser(id) {
   return request({
-    url: 'mgr/freeze',
+    url: 'sys/mgr/freeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
@@ -53,38 +53,38 @@
 // 冻结用户
 export function unfreezeUser(id) {
   return request({
-    url: 'mgr/unfreeze',
+    url: 'sys/mgr/unfreeze',
     method: 'post',
-    params: {
+    data: {
       id: id
     }
   })
 }
 
 // 重置用户密码
-export function resetPwd(params) {
+export function resetPwd(data) {
   return request({
-    url: 'mgr/reset',
+    url: 'sys/mgr/reset',
     method: 'post',
-    params
+    data
   })
 }
 
 // 修改密码
-export function changePwd(params) {
+export function changePwd(data) {
   return request({
-    url: 'mgr/changePwd',
+    url: 'sys/mgr/changePwd',
     method: 'post',
-    params
+    data
   })
 }
 
 // 分配角色
 export function roleAssign(userId, ids) {
   return request({
-    url: 'mgr/roleAssign',
+    url: 'sys/mgr/roleAssign',
     method: 'post',
-    params: {
+    data: {
       userId: userId,
       roleIds: ids
     },
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 851dfcc..2a9d2b6 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDeptSelect" class="dept-select">
-    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :placeholder="placeholder" clearable />
-    <el-select v-else v-model="selected" :placeholder="placeholder" clearable>
+    <select-tree v-if="multiData" v-model="selected" :size="size" :options="deptTreeList" :props="defaultProps" :disabled="disabled" :placeholder="placeholder" clearable />
+    <el-select v-else v-model="selected" :placeholder="placeholder" :disabled="disabled" clearable>
       <el-option
         v-for="item in deptTreeList"
         :key="item.id"
@@ -39,6 +39,10 @@
       type: String,
       default: ''
     }, // 显示的下拉组织类型：公司/部门
+    disabled: {
+      type: Boolean,
+      default: false
+    }, // 是否禁用
     deptShow: {
       type: Boolean,
       default: false
@@ -87,8 +91,8 @@
         }
       }
       getDeptTreeList(listQuery).then(response => {
-        const list = response.data.list
-        this.originList = [...response.data.list]
+        const list = response.data
+        this.originList = [...response.data]
         // 如果deptShow 为false 并且 列表的长度小于1 不显示
         if (!this.deptShow && list.length <= 1) {
           this.showDeptSelect = false
@@ -98,7 +102,7 @@
             // 如果有必要转树,使用selectTree控件
             if (judgeTree(list)) {
               this.multiData = true
-              this.deptTreeList = toTreeList(response.data.list, '0', this.needTop)
+              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
               // 如果不需要顶级,将顶级去掉
               if (!this.needTop && this.deptTreeList.length === 1) {
                 this.deptTreeList = this.deptTreeList[0].children
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 4071601..f36bdd5 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -8,25 +8,25 @@
     @show="onShowPopover"
     @hide="onHidePopover"
   >
-    <el-tree
-      ref="tree"
-      :style="`min-width: ${treeWidth}`"
-      :data="data"
-      :props="props"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :default-expand-all="false"
-      class="innerbox"
-      highlight-current
-      accordion
-      @node-click="onClickNode"
-    />
+    <el-scrollbar wrap-style="overflow-x:hidden;" style="height:200px">
+      <el-tree
+        ref="tree"
+        :style="`min-width: ${treeWidth}`"
+        :data="data"
+        :props="props"
+        :expand-on-click-node="false"
+        :filter-node-method="filterNode"
+        :default-expand-all="false"
+        highlight-current
+        accordion
+        @node-click="onClickNode"
+      />
+    </el-scrollbar>
     <el-input
       slot="reference"
       ref="input"
       v-model="labelModel"
       :style="`width: ${width}px`"
-      :size="size"
       :class="{ 'rotate': showStatus }"
       :placeholder="placeholder"
       :disabled="disabled"
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'SelectTree',
   // 设置绑定参数
@@ -56,10 +55,6 @@
       type: String,
       default: ''
     },
-    size: {
-      type: String,
-      default: ''
-    },
     // 输入框宽度
     disabled: {
       type: Boolean,
@@ -97,7 +92,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: ''
+      valueModel: '0'
     }
   },
   computed: {
@@ -114,11 +109,10 @@
   },
   watch: {
     labelModel(val) {
-      console.log('labelModel change:' + val)
       if (!val) {
         if (val === '') {
           this.valueModel = ''
-          this.onCloseTree()
+          this.value = ''
           this.$emit('selected', this.valueModel)
         }
         this.valueModel = ''
@@ -162,10 +156,6 @@
     // 隐藏时触发
     onHidePopover() {
       this.showStatus = false
-      console.log('onHidePopover:' + this.valueModel)
-      // if (this.valueModel !== '') {
-      //   this.$emit('selected', this.valueModel)
-      // }
       this.$emit('selected', this.valueModel)
     },
     // 树节点过滤方法
@@ -256,26 +246,4 @@
   .select-tree .el-input.el-input--suffix.rotate .el-input__suffix {
     transform: rotate(180deg);
   }
-
-  .innerbox::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 4px;
-  }
-  .innerbox::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .innerbox::-webkit-scrollbar-track { /*滚动条里面轨道*/
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0.1);
-  }
-</style>
-<style lang="scss">
-  .el-popover{
-    max-height: 400px;
-    overflow: auto;
-  }
-
 </style>
diff --git a/src/directive/resize/index.js b/src/directive/resize/index.js
new file mode 100644
index 0000000..1fca12b
--- /dev/null
+++ b/src/directive/resize/index.js
@@ -0,0 +1,16 @@
+export default {
+  bind(el, binding, value) {
+
+  },
+  inserted(el, binding) {
+    // 将回调函数从参数binding中取出来
+    const callback = binding.value
+    // 监听浏览器的resize事件
+    window.addEventListener('resize', () => {
+      callback(window.inner)
+    })
+  },
+  unbind(el, binding, vnode) {
+
+  }
+}
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
new file mode 100644
index 0000000..2de02b7
--- /dev/null
+++ b/src/directive/resize/resize.js
@@ -0,0 +1,13 @@
+import resize from './resize'
+
+const install = function(Vue) {
+  Vue.directive('resize', resize)
+}
+
+if (window.Vue) {
+  window.resize = resize
+  Vue.use(install); // eslint-disable-line
+}
+
+resize.install = install
+export default resize
diff --git a/src/permission.js b/src/permission.js
index c986d00..dfd4e8c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
 
 const whiteList = ['/login', 'config/baseconfig'] // 不重定向白名单
 // 全局钩子
-router.beforeEach(async(to, from, next) => {
+router.beforeEach((to, from, next) => {
   NProgress.start() // 加载进度条
   // 如果有token
   const hasToken = getToken()
@@ -22,14 +22,17 @@
       // 当进入非登陆页时
       if (store.getters.roleList && store.getters.roleList.length === 0) { // 判断当前用户是否已拉取完user_info信息
         try {
-          await store.dispatch('GetInfo')
-          const accessRoutes = await store.dispatch('GetMenus')
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          store.dispatch('GetInfo').then(() => {
+            store.dispatch('GetMenus').then((accessRoute) => {
+              router.addRoutes(accessRoute)
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            })
+          })
         } catch (err) {
-          await store.dispatch('FedLogOut')
-          Message.error(err || '权限验证失败，请重新登录系统')
-          next({ path: '/' })
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || '权限验证失败，请重新登录系统')
+            next({ path: '/' })
+          })
         }
       } else { // 角色不为空
         next()
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 098b76f..d7ec1d5 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -16,49 +16,55 @@
       path: '/resource',
       name: 'Resource',
       component: () => import('@/views/system/resource/listResource'),
-      meta: { title: '资源管理', icon: 'function', permission: ['/resource'] }
+      meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
-      meta: { title: '字典管理', icon: 'function', permission: ['/dict'] }
+      meta: { title: '字典管理', icon: 'function', permission: ['/sys/dict'] }
     },
     {
       path: '/area',
       name: 'Area',
       component: () => import('@/views/system/area/listArea'),
-      meta: { title: '区域管理', icon: 'function', permission: ['/area'] }
+      meta: { title: '区域管理', icon: 'function', permission: ['/sys/area'] }
     },
     {
       path: '/dept',
       name: 'Dept',
       component: () => import('@/views/system/dept/listDept'),
-      meta: { title: '组织管理', icon: 'tree', permission: ['/dept'] }
+      meta: { title: '组织管理', icon: 'tree', permission: ['/sys/dept'] }
     },
     {
       path: '/role',
       component: () => import('@/views/system/role/listRole'), // Parent router-view
       name: 'Role',
-      meta: { title: '角色管理', permission: ['/role'] }
+      meta: { title: '角色管理', permission: ['/sys/role'] }
     },
     {
       path: '/user',
       component: () => import('@/views/system/user/listUser'), // Parent router-view
       name: 'User',
-      meta: { title: '用户管理', permission: ['/mgr'] }
+      meta: { title: '用户管理', permission: ['/sys/mgr'] }
     },
     {
-      path: '/log',
+      path: '/bizLog',
+      component: () => import('@/views/system/log/listLog'), // Parent router-view
+      name: 'BusinessLog',
+      meta: { title: '日志管理', permission: ['/sys/log/biz/list'] }
+    },
+    {
+      path: '/errLog',
       component: () => import('@/views/system/log/listErrorLog'), // Parent router-view
-      name: 'Log',
-      meta: { title: '日志管理', permission: ['/log'] }
+      name: 'ErrorLog',
+      meta: { title: '日志管理', permission: ['/sys/log/error/list'] }
     },
     {
       path: '/loginLog',
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
-      meta: { title: '登录日志', permission: ['/loginLog'] }
+      meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
     }
   ]
 }]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0d0d482..2da523d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,11 +17,13 @@
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
+  area: state => state.user.area, // 用户所在区域
   menus: state => state.permission.menus, // 菜单
   systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
-  area: state => state.user.area // 用户所在区域
+  bodyHeight: state => state.settings.bodyHeight // 高度
+
 }
 export default getters
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 492941f..4a0b1dc 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -31,7 +31,7 @@
     state.device = device
   },
   SYS_CONFIG: (state, config) => {
-    state.kaptcha = config.kaptcha
+    state.kaptcha = config.appKaptcha
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e59ed20..5285a1a 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -8,7 +8,8 @@
   showSettings: showSettings, // 是否显示设置按钮
   tagsView: tagsView, // 是否显示tagsView
   fixedHeader: fixedHeader, // 是否固定面包屑
-  sidebarLogo: sidebarLogo // 是否显示logo
+  sidebarLogo: sidebarLogo, // 是否显示logo
+  bodyHeight: 400 // 内容高度
 }
 
 const mutations = {
@@ -16,12 +17,18 @@
     if (Object.prototype.hasOwnProperty.call(state, 'key')) {
       state[key] = value
     }
+  },
+  SET_BODY_HEIGHT: (state, height) => {
+    state.height = height
   }
 }
 
 const actions = {
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
+  },
+  changeHeight({ commit }, height) {
+    commit('SET_BODY_HEIGHT', height)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b9d50c6..dfbfaf4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,13 +3,16 @@
 
 const user = {
   state: {
-    token: getToken(),
+    token: getToken(), // token
     id: '', // id,
     account: '', // 账号
     name: '', // 姓名
     deptId: '', // 部门id
     deptName: '', // 部门名称
-    roleList: [], // 角色编号集合
+    avatar: '', // 头像
+    attr1: '', // 备用属性
+    tenantId: '', // 租户id
+    roleList: [], // 角色id集合
     roleNames: [], // 角色名称集合
     roleTips: [], // 角色标签集合
     area: '' // 默认地区
@@ -27,6 +30,21 @@
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ATTR1: (state, attr1) => {
+      state.attr1 = attr1
+    },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLELIST: (state, roleList) => {
       state.roleList = roleList
     },
@@ -36,12 +54,7 @@
     SET_ROLETIPS: (state, roleTips) => {
       state.roleTips = roleTips
     },
-    SET_DEPTID: (state, deptId) => {
-      state.deptId = deptId
-    },
-    SET_DEPTNAME: (state, deptName) => {
-      state.deptName = deptName
-    },
+
     SET_AREA: (state, area) => {
       state.area = area
     }
@@ -83,8 +96,8 @@
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组
-            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/views/login/index_2.vue b/src/views/login/index_2.vue
index e4d7a5b..4e3fee6 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -3,7 +3,7 @@
   <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
       <div ref="element" class="right-div">
-        <el-form id="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="right">
+        <el-form id="login-form" ref="loginForm" :model="loginForm" size="large" :rules="loginRules" class="login-form" autocomplete="on" label-position="right">
           <h5 class="login-title">
             用户登录
           </h5>
@@ -11,15 +11,13 @@
             USER LOGIN
           </h5>
           <el-form-item prop="username">
-            <span class="svg-container">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
+            <el-input v-model.trim="loginForm.username" name="username" type="text" autocomplete="on" placeholder="用户名">
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="user" />
+              </span>
+            </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
             <el-input
               v-model.trim="loginForm.password"
               :type="pwdType"
@@ -27,10 +25,14 @@
               auto-complete="on"
               placeholder="密码"
               @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
-            </span>
+            >
+              <span slot="prefix" class="input-prefix-icon">
+                <svg-icon icon-class="password" />
+              </span>
+              <span slot="suffix" class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-input>
           </el-form-item>
 
           <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
@@ -48,8 +50,8 @@
       <!--logo-img-->
       <svg-icon icon-class="logo" />
       <!--title-img-->
-      <div class="title-img">
-        <el-image :src="titleUrl"/>
+      <div class="title-img-div">
+        <img :src="titleUrl" class="title-img" fit="scale-down"/>
       </div>
     </div>
   </div>
@@ -121,9 +123,9 @@
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.loading = true
     this.$store.dispatch('GetConfig').then(() => {
-      this.showKaptcha = this.$store.getters.kaptcha
       this.loading = false
       this.$message.success('连接服务器成功')
+      this.showKaptcha = this.$store.getters.kaptcha
     }).catch((e) => {
       this.$message.error('连接服务器失败')
       this.loading = false
@@ -142,10 +144,7 @@
       console.log(this.loginForm.kaptcha)
     },
     handleLogin() { // 点击登录按钮
-      // if (!this.showKaptcha) { // 如果未开启验证码，将验证码字段从提交字段中移除
-      //   delete this.loginForm['kaptcha']
-      //   delete this.loginRules['kaptcha']
-      // }
+
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
@@ -159,7 +158,7 @@
           this.$store.dispatch('Login', loginForm).then(() => {
             this.loading = false
             this.$message.success('登录成功')
-            this.$router.push({ path: '/' },()=>{})
+            this.$router.push({ path: '/' }, () => {})
           }).catch(() => {
             this.loading = false
             if (this.showKaptcha) {
@@ -182,32 +181,19 @@
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
-    display: inline-block;
-    height: 40px;
-    width: 85%;
-    input {
-      background: transparent;
-      border: 0px;
-      -webkit-appearance: none;
-      border-radius: 0px;
-      padding: 8px 5px 8px 8px;
-      color: $dark_gray;
-      height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
-      }
-    }
-  }
   .el-form-item {
-    border: 1px solid #c5c5c5;
+    /*border: 1px solid #c5c5c5;*/
     background: #ffffff;
     border-radius: 5px;
-    color: #000000;
+    /*color: #000000;*/
     margin-bottom: 35px;
-    .el-form-item__error{
-      line-height: 2 !important;
+    .el-form-item__content{
+      line-height: 47px;
+    }
+    .el-input__inner{
+      /*padding-top: 5px;*/
+      /*padding-bottom:5px;*/
+      height: 48px;
     }
   }
   .el-button {
@@ -225,7 +211,6 @@
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: #000000;
   background-repeat: no-repeat;
   -webkit-background-size: 100% 100%;
   background-size: 100% 100%;
@@ -233,110 +218,85 @@
   .system-title{
     font-size: 30px;
     color: white;
-    position: fixed;
-    top:40px;
-    left:50px;
+    position: absolute;
+    top:2rem;
+    left:4rem;
+    height:3rem;
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .title-img{
+    .title-img-div{
       position:relative;
-      height: 80px;
-      width: 200px;
+      height: 100%;
+      min-width: 200px;
+      .title-img{
+        height:100%;
+      }
+      /*width: 200px;*/
     }
   }
+  /*登录div*/
   .login-div{
-    /*height:385px;*/
     width:500px;
     position:absolute;
     overflow:hidden;
     left:60%;
     top:50%;
     margin-top:-220px;
-    /*border:1px solid #889aa4;*/
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:100%;
-    padding: 20px 50px;
-    float:left;
-    /*background-color:white*/
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    .el-form-item{
-      margin-bottom: 35px;
-      .el-form-item__error{
-        line-height: 1.5 !important;
+    .right-div{
+      width:100%;
+      padding: 20px 50px;
+      float:left;
+      .login-form {
+        max-width: 100%;
+        padding: 15px 15px 5px 15px;
+        margin: auto;
+        overflow:hidden;
+        /*输入框前图标*/
+        .input-prefix-icon {
+          padding: 0px 6px;
+          color: $dark_gray;
+        }
+        /*显示密码图标*/
+        .show-pwd {
+          font-size: 16px;
+          padding:0 6px;
+          color: $dark_gray;
+          cursor: pointer;
+          user-select: none;
+        }
+        /*用户登录*/
+        .login-title {
+          font-size: 25px;
+          font-weight: 500;
+          color: #0e3877;
+          margin: 10px auto 10px auto;
+        }
+        /*登录英文*/
+        .login-subtitle {
+          font-size: 18px;
+          font-weight: 400;
+          color: #9c9c9c;
+          margin: 10px auto 30px auto;
+        }
+        /*登录按钮*/
+        .login-btn {
+          background-color: #3948d5;
+          font-size: 17px;
+          border-color: #3948d5;
+          color:#fff;
+          line-height: 1.2;
+          padding: 12px 20px;
+        }
+        .login-btn:hover {
+          background-color: #5863f6;
+          border-color: #5863f6;
+        }
+      }
+      .clear-div{
+        clear:both;
       }
     }
-    /*border-radius: 3px;*/
-    /*box-shadow: 0 5px 8px rgba(0, 0, 0, .12), 0 0 10px rgba(0, 0, 0, .04);*/
-  }
-  .tips {
-    font-size: 14px;
-    /*color: #fff;*/
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 25px;
-    font-weight: 500;
-    color: #0e3877;
-    margin: 10px auto 10px auto;
-  }
-  .login-subtitle {
-    font-size: 18px;
-    font-weight: 400;
-    color: #9c9c9c;
-    margin: 10px auto 30px auto;
-  }
-  .login-btn {
-    background-color: #3948d5;
-    font-size: 17px;
-    border-color: #3948d5;
-    color:#fff;
-    line-height: 1.2;
-    padding: 12px 20px;
-  }
-  .login-btn:hover {
-    background-color: #5863f6;
-    border-color: #5863f6;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
   }
 }
 </style>
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index bf4c8a7..462004a 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -3,22 +3,20 @@
     <el-form ref="dataForm" :rules="rules" :model="deptForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="组织名称" prop="simplename">
-            <el-input v-model.trim="deptForm.simplename" type="text" placeholder="必填" />
+          <el-form-item label="组织名称" prop="simpleName">
+            <el-input v-model.trim="deptForm.simpleName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织全称" prop="fullname">
-            <el-input v-model.trim="deptForm.fullname" type="text" placeholder="必填" />
+          <el-form-item label="组织全称" prop="fullName">
+            <el-input v-model.trim="deptForm.fullName" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="父组织" prop="pid">
-            <!--<dept-select v-model="deptForm.pid" :dept-tree-list="deptTreeList" :dept-props="defaultProps" :multi-data="multiData" >-->
-            <dept-select v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
-            <!--<select-tree v-model="deptForm.pid" :options="deptTreeList" :props="defaultProps" />-->
+            <dept-select ref="deptSelect" v-model="deptForm.pid" :dept-show="true" placeholder="请选择父组织">
             </dept-select>
           </el-form-item>
         </el-col>
@@ -39,7 +37,6 @@
                 :value="item.value"
               />
             </el-select>
-            <!--<el-input v-model="resourceForm.resourceType" type="text" placeholder="必填"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,8 +71,8 @@
       dialogStatus: '', // 对话框类型：create,update
       deptForm: {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         version: '',
@@ -90,14 +87,8 @@
         children: 'children'
       },
       deptTypList: [
-        {
-          name: '公司/单位',
-          value: '03'
-        },
-        {
-          name: '部门/组',
-          value: '04'
-        }
+        { name: '公司/单位', value: '03' },
+        { name: '部门/组', value: '04' }
       ],
       btnLoading: false, // 保存按钮的加载中状态
       multiData: false, // 组织树是否为多级列表
@@ -107,8 +98,8 @@
         create: '新增'
       }, // 表头显示标题
       rules: {
-        simplename: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
-        fullname: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
+        simpleName: [{ required: true, message: '组织名称不能为空', trigger: ['blur', 'change'] }],
+        fullName: [{ required: true, message: '组织全称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
         deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }]
@@ -122,16 +113,13 @@
       return tree
     }
   },
-  mounted: function() {
-    // this.fetchPcode()
-  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      // this.fetchPcode()
+      this.$refs.deptSelect.fetchPcode()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.$nextTick(() => {
@@ -140,8 +128,8 @@
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.deptForm = {
           id: row.id,
-          simplename: row.simplename,
-          fullname: row.fullname,
+          simpleName: row.simpleName,
+          fullName: row.fullName,
           pid: row.pid,
           pids: row.pids,
           num: row.num,
@@ -151,30 +139,12 @@
         }
       }
     },
-    // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      getDeptTreeList(this.listQuery).then(response => {
-        const list = response.data.list
-        list.push({ id: '0', name: '顶级', open: true, value: '0' })
-        if (list) {
-          // 如果有必要转树
-          if (judgeTree(list)) {
-            this.multiData = true
-            this.deptTreeList = toTreeList(response.data.list, '0', true)
-          } else {
-            this.deptTreeList = list
-            this.multiData = false
-          }
-          console.log(this.deptTreeList)
-        }
-      })
-    },
     // 重置表单
     resetForm() {
       this.deptForm = {
         id: '',
-        simplename: '',
-        fullname: '',
+        simpleName: '',
+        fullName: '',
         pid: '',
         pids: '',
         num: '',
@@ -208,6 +178,7 @@
                 this.resetForm()
                 this.$nextTick(() => {
                   this.$refs['dataForm'].clearValidate()
+                  this.$refs.deptSelect.fetchPcode()
                 })
               }).catch(() => {
                 this.$emit('watchChild')
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 15c6f6b..7856f61 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -9,17 +9,18 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dept/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dept/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="130" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dept/update')" type="text" size="small" @click="edit(scope.row)">
+            <!--顶级去掉修改删除功能-->
+            <el-button v-if="hasPerm('/sys/dept/update')&&scope.row.id!='0'" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dept/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dept/delete')&&scope.row.id!='0'" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -51,8 +52,8 @@
         deptName: ''
       },
       columns: [
-        { text: '组织名称', value: 'simplename', align: 'left' },
-        { text: '组织全称', value: 'fullname' },
+        { text: '组织名称', value: 'simpleName', align: 'left' },
+        { text: '组织全称', value: 'fullName' },
         { text: '备注', value: 'tips' },
         { text: '排序', value: 'num', width: 80 }
       ],
@@ -64,24 +65,27 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
     this.fetchData()
   },
   methods: {
+    // 打开新增弹窗
     add() {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.$refs.editdept.initDialog(this.dialogStatus)
     },
+    // 打开编辑弹窗
     edit(row) {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       console.log('row:' + row)
       this.$refs.editdept.initDialog(this.dialogStatus, row)
     },
+    // 删除
     del(row) {
       this.$confirm(
         '确定要删除' + row.simplename + '吗？',
@@ -93,26 +97,24 @@
         }
       ).then(() => {
         delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-            // deleteItem(this.list, row)// 前端删除指定项
-          }
+          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.listLoading = false
       })
     },
-    // 在嵌套列表list中删除指定元素
+    // 在嵌套列表list中删除指定元素, 已废除
     deleteItem(des) {
       // deleteItem(this.list, des)
       const del = (list, item) => {
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index e945388..1837371 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -9,17 +9,17 @@
     <!--查询结果Table显示-->
     <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/dict/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/dict/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="160" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/dict/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/dict/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/dict/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -86,7 +86,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
+      return this.hasPerm('/sys/dict/update') || this.hasPerm('/sys/dict/delete')
     }
   },
   created() {
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 75a1d2d..47857bd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -2,9 +2,9 @@
   <app-container>
     <!--筛选条件-->
     <search-area size="small" @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />
-      </search-item>
+      <!--<search-item>-->
+        <!--<el-input v-model.trim="listQuery.keywords" size="small" placeholder="日志名称" clearable />-->
+      <!--</search-item>-->
       <search-item>
         <el-date-picker
           v-model="listQuery.beginTime"
@@ -24,7 +24,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/error/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getErrorLogList, getErrorLogDetail, delErrorLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -62,7 +62,7 @@
       },
       columns: [
         { text: '用户', value: 'userName', width: '150' },
-        { text: '时间', value: 'createtime', width: '150' },
+        { text: '时间', value: 'createTime', width: '150' },
         { text: '详细信息', value: 'message' }
       ], // 显示列
       list: [], // 数据列表
@@ -76,7 +76,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getErrorLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定',
@@ -96,7 +96,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delLog(this.listQuery).then(response => {
+        delErrorLog(this.listQuery).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.list = []
@@ -115,7 +115,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getErrorLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index db723a1..d3ae75b 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,3 +1,4 @@
+<!--业务日志-->
 <template>
   <app-container>
     <!--筛选条件-->
@@ -24,7 +25,7 @@
         />
       </search-item>
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/log/biz/delLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { getLogList, getLogDetail, getLogType, delLog } from '@/api/system/log'
+import { getBizLogList, getBizLogDetail, getLogType, delLog } from '@/api/system/log'
 export default {
   name: 'ListLog',
   data() {
@@ -54,7 +55,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        logType: '业务日志',
+        // logType: '业务日志',
         offset: 1,
         limit: 20,
         sort: '',
@@ -62,21 +63,17 @@
       },
       columns: [
         {
-          text: '日志类型',
-          value: 'logtype'
-        },
-        {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
-          text: '账号',
+          text: '用户',
           value: 'userName'
         },
         {
           text: '时间',
-          value: 'createtime'
+          value: 'createTime'
         },
         {
           text: '详细信息',
@@ -98,7 +95,7 @@
   methods: {
     // 打开详情对话框
     detail(row) {
-      getLogDetail(row.id).then(res => {
+      getBizLogDetail(row.id).then(res => {
         if (res.code === 200) {
           this.$alert(res.data, '详情', {
             confirmButtonText: '确定'
@@ -137,7 +134,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getLogList(this.listQuery).then(response => {
+      getBizLogList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 25b34e6..a85fbcc 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -23,14 +23,14 @@
           placeholder="选择结束时间"
         />
       </search-item>
-    </search-area>
-    <!--查询结果Table显示-->
-    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/log/clearAll')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
+        <el-button v-if="hasPerm('/sys/loginLog/delLoginLog')" class="filter-item" size="small" type="info" icon="el-icon-delete" @click="cleanAll">
           清空日志
         </el-button>
       </template>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" @change="changePage">
     </normal-table>
   </app-container>
 </template>
@@ -53,7 +53,7 @@
       columns: [
         {
           text: '日志名称',
-          value: 'logname',
+          value: 'logName',
           width: 150
         },
         {
@@ -70,7 +70,7 @@
         },
         {
           text: '操作时间',
-          value: 'createtime'
+          value: 'createTime'
         }
       ],
       list: [],
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index a86dcf3..feda38f 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -153,8 +153,8 @@
     fetchPcode: function() {
       getResourceTreeList(this.listQuery).then(response => {
         console.log(response.data)
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list, '0', true)
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data, '0', true)
           console.log(this.resourceTreeList)
         }
       })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index d7768e4..e2f18a4 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -8,12 +8,22 @@
       <search-item>
         <el-input v-model="listQuery.resourceUrl" size="small" placeholder="资源路径" clearable />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.resourceType" size="small" placeholder="资源类型" clearable>
+          <el-option
+            v-for="item in resourceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
     </search-area>
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <!--右上角按钮-->
       <template slot="btns">
-        <el-button v-if="hasPerm('/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/resource/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
@@ -21,10 +31,10 @@
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="110" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/resource/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/resource/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/resource/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
           </template>
@@ -40,25 +50,23 @@
 
 import treeTable from '@/components/TreeTable/treeTable'
 import editResource from '@/views/system/resource/editResource'
-import { getResourceList, delResource } from '@/api/system/resource'
+import { getResourceList, getResourceTypeList, delResource } from '@/api/system/resource'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListResource',
-  components: { SearchItem, SearchArea, AppContainer, treeTable, editResource },
+  components: { treeTable, editResource },
   data() {
     return {
       listQuery: {
         resourceName: '', // 资源名称
-        resourceUrl: '' // 资源路径
+        resourceUrl: '', // 资源路径
+        resourceType: '' // 资源类型
       }, // 查询条件
       columns: [
         { text: '资源名称', value: 'name', type: 'expand', align: 'left' },
         { text: '资源编号', value: 'code' },
-        { text: '父资源编号', value: 'pcode' },
+        { text: '父资源编号', value: 'pCode' },
         { text: '资源路径', value: 'url' },
         { text: '排序', value: 'num', width: 50 },
         { text: '层级', value: 'levels', width: 50 },
@@ -67,16 +75,22 @@
       ], // 动态加载的表头
       list: [], // 资源数据列表
       listLoading: true, // 列表加载动画是否显示
+      resourceTypeList: [
+        { value: '02', name: '系统' },
+        { value: '03', name: '菜单' },
+        { value: '04', name: '按钮' }
+      ], // 资源类型
       dialogFormVisible: false, // 对话框是否可见
       dialogStatus: '' // 对话框状态
     }
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/resource/update') || this.hasPerm('/resource/delete')
+      return this.hasPerm('/sys/resource/update') || this.hasPerm('/sys/resource/delete')
     }
   },
   created() {
+    this.fetchResourceType()
     this.fetchData()
   },
   methods: {
@@ -111,13 +125,21 @@
     search() {
       this.fetchData()
     },
+    // 获取数据
     fetchData() {
-      console.log('fetchData')
       this.listLoading = true
       getResourceList(this.listQuery).then(response => {
-        this.list = toTreeList(response.data.list, '0', false)
+        this.list = toTreeList(response.data, '0', false)
         this.listLoading = false
       })
+    },
+    // 加载资源类型列表
+    fetchResourceType() {
+      getResourceTypeList(this.listQuery).then(response => {
+        if (response.data) {
+          this.resourceTypeList = response.data
+        }
+      })
     }
   }
 }
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index fe881dc..d2a6299 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -57,20 +57,20 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index a06c6be..69219e8 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -27,8 +27,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="所在组织机构" prop="deptid">
-            <dept-select v-model="roleForm.deptid" placeholder="请选择组织机构" />
+          <el-form-item label="所在组织机构" prop="deptId">
+            <dept-select v-model="roleForm.deptId" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,7 +77,7 @@
         pid: '', // 父级编号
         name: '', // 角色名
         tips: '', // 别名，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         version: '', // 保留字段
         num: 99, // 排序
         dataScopeType: '' // 数据权限类型
@@ -104,7 +104,7 @@
       rules: {
         name: [{ required: true, message: '角色名称不能为空', trigger: ['blur', 'change'] }],
         pid: [{ required: true, message: '父角色必选', trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         tips: [{ required: true, message: '别名必填', trigger: ['blur', 'change'] }],
         num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
         dataScopeType: [{ required: true, message: '数据权限类型必选' }]
@@ -124,9 +124,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -140,7 +140,7 @@
           pid: row.pid, // 父级编号
           name: row.name, // 角色名
           tips: row.tips, // 别名，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           version: row.version, // 保留字段
           dataScopeType: row.dataScopeType, // 数据权限类型
           num: row.num // 排序
@@ -169,15 +169,14 @@
     // 重置表单
     resetForm() {
       this.roleForm = {
-        id: '',
-        simplename: '',
-        fullname: '',
-        pid: '',
-        pids: '',
-        num: 99,
-        tips: '',
-        dataScopeType: '',
-        version: ''
+        id: '', // 编号
+        pid: '', // 父级编号
+        name: '', // 角色名
+        tips: '', // 别名，
+        deptId: '', // 组织机构编号
+        version: '', // 保留字段
+        num: 99, // 排序
+        dataScopeType: '' // 数据权限类型
       }
     },
     // 保存数据
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index 635acf7..e7b5d51 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -55,19 +55,19 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchResourceTree()
     },
     // 获取资源列表
     fetchResourceTree: function() {
       getResourceListByRole(this.roleId).then(response => {
-        if (response.data.list) {
-          this.resourceTreeList = toTreeList(response.data.list)
-          const temp = getShowItem(response.data.list) // 获取展开项和选中项
+        if (response.data) {
+          this.resourceTreeList = toTreeList(response.data)
+          const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
           this.loading = false
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index eb6ff09..6dfd64d 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -9,23 +9,23 @@
     <!--查询结果Table显示-->
     <tree-table :data="list" :columns="columns" :query="listQuery" :list-loading="listLoading" rowkey="id">
       <template slot="btns">
-        <el-button v-if="hasPerm('/role/add')" size="small" icon="el-icon-plus" @click="add">
+        <el-button v-if="hasPerm('/sys/role/add')" size="small" icon="el-icon-plus" @click="add">
           新增
         </el-button>
       </template>
       <template slot="columns">
         <el-table-column v-if="showOperate" label="操作" width="250" align="center">
           <template slot-scope="scope">
-            <el-button v-if="hasPerm('/role/update')" type="text" size="small" @click="edit(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/update')" type="text" size="small" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="hasPerm('/role/delete')" type="text" size="small" @click="del(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/delete')" type="text" size="small" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="hasPerm('/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/funcAuthor')" type="text" size="small" @click="funcPermission(scope.row)">
               功能权限
             </el-button>
-            <el-button v-if="hasPerm('/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
+            <el-button v-if="hasPerm('/sys/role/dataAuthor')" type="text" size="small" @click="dataPermission(scope.row)">
               数据权限
             </el-button>
           </template>
@@ -49,16 +49,10 @@
 import dataPerm from '@/views/system/role/dataPerm'
 import { getRoleList, delRole } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
-import AppContainer from '../../../components/layout/AppContainer'
-import SearchArea from '../../../components/SearchArea/SearchArea'
-import SearchItem from '../../../components/SearchArea/SearchItem'
 
 export default {
   name: 'ListRole',
   components: {
-    SearchItem,
-    SearchArea,
-    AppContainer,
     treeTable,
     functionPerm,
     dataPerm,
@@ -86,7 +80,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/role/update') || this.hasPerm('/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
+      return this.hasPerm('/sys/role/update') || this.hasPerm('/sys/role/delete') || this.hasPerm('/role/funcPerm') || this.hasPerm('/role/dataPerm')
     }
   },
   created() {
@@ -104,7 +98,7 @@
       this.dialogFormVisible = true
       this.editShow = true
       console.log('row:' + row)
-      this.$refs.editrole.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+      this.$refs.editrole.initDialog(this.dialogStatus, row)
     },
     del(row) {
       this.$confirm(
@@ -131,9 +125,7 @@
       console.log('fetchData')
       this.listLoading = true
       getRoleList(this.listQuery).then(response => {
-        // console.log(response.data.list)
-        this.list = toTreeList(response.data.list)
-        console.log(this.list)
+        this.list = toTreeList(response.data)
         this.listLoading = false
       })
     },
@@ -154,13 +146,13 @@
     funcPermission(row) {
       this.dialogFormVisible = true
       this.functionShow = true
-      this.$refs.funcperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.funcperm.initDialog(row)
     },
     // 数据权限配置
     dataPermission(row) {
       this.dialogFormVisible = true
       this.dataShow = true
-      this.$refs.dataperm.initDialog(this.dialogFormVisible, row)
+      this.$refs.dataperm.initDialog(row)
     }
   }
 }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index e9709b2..d22cd09 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -45,8 +45,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="重复密码" prop="repassword">
-            <el-input v-model.trim="userForm.repassword" type="password" placeholder="必填" />
+          <el-form-item label="重复密码" prop="rePassword">
+            <el-input v-model.trim="userForm.rePassword" type="password" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -60,9 +60,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
+          <el-form-item label="组织机构" prop="deptId">
+            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
+            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -108,8 +108,8 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        if (this.userForm.rePassword !== '') {
+          this.$refs.dataForm.validateField('rePassword')
         }
         callback()
       }
@@ -133,10 +133,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '', // 重复密码
+        rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
       deptProps: {
@@ -172,8 +172,8 @@
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
         password: [{ required: true, validator: validatePass, trigger: ['blur', 'change'] }],
-        repassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
-        deptid: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
+        rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
         email: [{
           required: false, // 是否必填
@@ -207,9 +207,9 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+    initDialog: function(dialogStatus, row = null) {
       this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.btnLoading = false
       this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -226,14 +226,14 @@
           name: row.name, // 姓名
           email: row.email, // 邮箱，
           phone: row.phone, // 手机号，
-          deptid: row.deptid, // 组织机构编号
+          deptId: row.deptId, // 组织机构编号
           roleid: row.roleid, // 角色
           birthday: row.birthday, // 生日
           sex: row.sex // 性别
         }
         this.roleName = row.roleName
         delete this.userForm['password']
-        delete this.userForm['repassword']
+        delete this.userForm['rePassword']
       }
     },
     // 加载角色树形下拉菜单
@@ -255,10 +255,10 @@
         name: '', // 姓名
         email: '', // 邮箱，
         phone: '', // 手机号，
-        deptid: '', // 组织机构编号
+        deptId: '', // 组织机构编号
         roleid: '', // 角色
         password: '', // 密码
-        repassword: '' // 重复密码
+        rePassword: '' // 重复密码
       }
     },
     // 保存数据
@@ -275,6 +275,7 @@
         console.log(this.userForm)
         const userForm = JSON.parse(JSON.stringify(this.userForm))
         userForm.password = RSAencrypt(userForm.password)
+        userForm.rePassword = RSAencrypt(userForm.rePassword)
         if (valid) {
           this.btnLoading = true
           addUser(userForm).then(response => {
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1338588..fb77ecb 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -3,12 +3,12 @@
     <el-row>
       <!--左半部分-->
       <el-col :span="5">
-        <div class="deptScroll" style="width:90%;">
-          <el-card class="box-card">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll">
+            <el-scrollbar class="user-dept-scroll" ref="deptScroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -44,19 +44,19 @@
           </search-item>
           <template slot="btns">
             <div style="margin-bottom: 10px;">
-              <el-button v-if="hasPerm('/mgr/add')" size="small" type="primary" icon="el-icon-plus" @click="add">
+              <el-button v-if="hasPerm('/sys/mgr/add')" size="small" type="primary" icon="el-icon-plus" @click="add">
                 新增
               </el-button>
-              <el-button v-if="hasPerm('/mgr/update')" size="small" type="primary" icon="el-icon-edit" @click="edit">
+              <el-button v-if="hasPerm('/sys/mgr/update')" size="small" type="primary" icon="el-icon-edit" @click="edit">
                 修改
               </el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" size="small" type="primary" icon="el-icon-delete" @click="del">
+              <el-button v-if="hasPerm('/sys/mgr/delete')" size="small" type="primary" icon="el-icon-delete" @click="del">
                 删除
               </el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" size="small" type="primary" icon="el-icon-key" @click="resetPwd">
+              <el-button v-if="hasPerm('/sys/mgr/reset')" size="small" type="primary" icon="el-icon-key" @click="resetPwd">
                 重置密码
               </el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" size="small" type="primary" icon="el-icon-magic-stick" @click="roleAssign">
+              <el-button v-if="hasPerm('/sys/mgr/roleAssign')" size="small" type="primary" icon="el-icon-magic-stick" @click="roleAssign">
                 角色分配
               </el-button>
             </div>
@@ -65,7 +65,7 @@
         <!--查询结果Table显示-->
         <normal-table ref="normalTable" class="table" :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" size="small" @change="changePage">
           <template slot="preColumns">
-            <el-table-column label="选择" width="50" header-align="center" align="center">
+            <el-table-column label="选择" width="55" header-align="center" align="center">
               <template slot-scope="scope">
                 <el-radio v-model="radio" :label="scope.$index" class="radio">
                   &nbsp;
@@ -82,9 +82,9 @@
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" align="center" width="70">
+            <el-table-column v-if="hasPerm('/sys/mgr/freeze')" label="操作" align="center" width="70">
               <template slot-scope="scope">
-                <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">
+                <el-button v-if="hasPerm('/sys/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">
                   {{ btnNames[scope.row.statusName] }}
                 </el-button>
               </template>
@@ -95,6 +95,7 @@
     </el-row>
     <!--编辑用户的对话框-->
     <edit-user v-show="editShow" ref="edituser" @watchChild="fetchData" />
+    <!--配置角色对话框-->
     <role-assign v-show="roleAssignShow" ref="roleassign" @watchChild="fetchData" />
   </div>
 </template>
@@ -121,7 +122,7 @@
         keywords: '',
         beginTime: '',
         endTime: '',
-        deptid: '',
+        deptId: '',
         offset: 1,
         limit: 20,
         sort: 'id'
@@ -140,31 +141,12 @@
         '启用': 'primary'
       },
       columns: [
-        {
-          text: '账号',
-          value: 'account'
-        },
-        {
-          text: '所在组织机构',
-          value: 'deptName',
-          width: 150
-        },
-        {
-          text: '真实姓名',
-          value: 'name'
-        },
-        {
-          text: '角色',
-          value: 'roleName'
-        },
-        {
-          text: '手机号',
-          value: 'phone'
-        },
-        {
-          text: '注册日期',
-          value: 'createtime'
-        }
+        { text: '账号', value: 'account' },
+        { text: '所在组织机构', value: 'deptName', width: 150 },
+        { text: '真实姓名', value: 'name' },
+        { text: '角色', value: 'roleName' },
+        { text: '手机号', value: 'phone' },
+        { text: '注册日期', value: 'createtime' }
       ],
       list: [],
       total: 0,
@@ -175,7 +157,6 @@
       },
       treeLoading: false,
       listLoading: false,
-      dialogFormVisible: false,
       dialogStatus: '',
       editShow: false, // 编辑组件是否显示
       roleAssignShow: false, // 角色分配组件是否显示
@@ -202,18 +183,16 @@
     // 打开新增对话框
     add() {
       this.dialogStatus = 'create'
-      this.dialogFormVisible = true
       this.editShow = true
-      this.$refs.edituser.initDialog(this.dialogStatus, this.dialogFormVisible)
+      this.$refs.edituser.initDialog(this.dialogStatus)
     },
     // 打开修改对话框
     edit() {
       if (this.singleCheck()) {
         this.dialogStatus = 'update'
-        this.dialogFormVisible = true
         this.editShow = true
         const row = this.list[this.radio]
-        this.$refs.edituser.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+        this.$refs.edituser.initDialog(this.dialogStatus, row)
       } else {
         this.$message.error('必须选中一项')
       }
@@ -221,10 +200,9 @@
     // 打开角色分配对话框
     roleAssign() {
       if (this.singleCheck()) {
-        this.dialogFormVisible = true
         this.roleAssignShow = true
         const row = this.list[this.radio]
-        this.$refs.roleassign.initDialog(this.dialogFormVisible, row)
+        this.$refs.roleassign.initDialog(row)
       } else {
         this.$message.error('必须选中一项')
       }
@@ -245,7 +223,7 @@
           delUser(row.id).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
-              this.deleteItem(this.list, row)// 前端删除指定项
+              this.fetchData()
             }
           })
         })
@@ -343,13 +321,13 @@
     fetchDeptTree() {
       this.treeLoading = true
       getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data.list, '0', true)
+        this.deptTree = toTreeList(response.data, '0', true)
         this.treeLoading = false
       })
     },
     // 点击左侧组织结构项触发
     handleNodeClick(data) {
-      this.listQuery.deptid = data.id
+      this.listQuery.deptId = data.id
       this.fetchData()
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -382,41 +360,33 @@
         return true
       }
     }
-
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .form-container{
-    margin-bottom: 20px;
-  }
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .el-date-editor{
-    .el-range-separator{
-      width: 7% !important;
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 265px);
+        .filter-tree{
+
+        }
+      }
     }
   }
-  .el-range-separator{
-    width: 7% !important;
-  }
-  .el-scrollbar{
-    min-height: calc(100vh - 260px);
-    max-height: calc(100vh - 170px);
-  }
   .table{
     min-height: calc(100vh - 265px);
   }
 </style>
 <style>
-  .deptScroll .el-scrollbar__wrap{
-    overflow-x: hidden;
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
     background-color: #fff;
     padding: 0px;
   }
+
 </style>
diff --git a/src/views/system/user/roleAssign.vue b/src/views/system/user/roleAssign.vue
index 162e9e7..343b744 100644
--- a/src/views/system/user/roleAssign.vue
+++ b/src/views/system/user/roleAssign.vue
@@ -60,11 +60,11 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, row) {
+    initDialog: function(row) {
       this.loading = true
       this.userId = row.id
       this.userName = row.name
-      this.dialogFormVisible = dialogFormVisible
+      this.dialogFormVisible = true
       this.fetchRoleTree()
     },
     // 获取角色列表