diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {

diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
diff --git a/src/api/role.js b/src/api/role.js
index 9b76539..a4759cc 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -84,3 +84,12 @@
     }
   })
 }
+
+
+// 角色类型列表
+export function getDataScopeTypeList() {
+  return request({
+    url: 'dict/code/dataScopeType',
+    method: 'get'
+  })
+}

diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
diff --git a/src/api/role.js b/src/api/role.js
index 9b76539..a4759cc 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -84,3 +84,12 @@
     }
   })
 }
+
+
+// 角色类型列表
+export function getDataScopeTypeList() {
+  return request({
+    url: 'dict/code/dataScopeType',
+    method: 'get'
+  })
+}
diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png
new file mode 100644
index 0000000..4d694a8
--- /dev/null
+++ b/src/assets/global_images/header.png
Binary files differ

diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
diff --git a/src/api/role.js b/src/api/role.js
index 9b76539..a4759cc 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -84,3 +84,12 @@
     }
   })
 }
+
+
+// 角色类型列表
+export function getDataScopeTypeList() {
+  return request({
+    url: 'dict/code/dataScopeType',
+    method: 'get'
+  })
+}
diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png
new file mode 100644
index 0000000..4d694a8
--- /dev/null
+++ b/src/assets/global_images/header.png
Binary files differ
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 85427e4..6326221 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -38,7 +37,8 @@
     return {
       title: getProject().title,
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
   },
   computed: {
@@ -67,8 +67,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-header{
     height:60px;
-    /*background-color:rgb(48, 65, 86);*/
-    background: #000000 url("/static/images/global_images/header.png") no-repeat;
+    background-color:#000000;
+    background-repeat: no-repeat;
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
     color:white;
@@ -98,9 +98,6 @@
         border-radius: 10px;
       }
       .el-icon-caret-bottom {
-        /*position: absolute;*/
-        /*right: 0px;*/
-        /*top: 25px;*/
         font-size: 12px;
       }
     }

diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
diff --git a/src/api/role.js b/src/api/role.js
index 9b76539..a4759cc 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -84,3 +84,12 @@
     }
   })
 }
+
+
+// 角色类型列表
+export function getDataScopeTypeList() {
+  return request({
+    url: 'dict/code/dataScopeType',
+    method: 'get'
+  })
+}
diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png
new file mode 100644
index 0000000..4d694a8
--- /dev/null
+++ b/src/assets/global_images/header.png
Binary files differ
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 85427e4..6326221 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -38,7 +37,8 @@
     return {
       title: getProject().title,
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
   },
   computed: {
@@ -67,8 +67,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-header{
     height:60px;
-    /*background-color:rgb(48, 65, 86);*/
-    background: #000000 url("/static/images/global_images/header.png") no-repeat;
+    background-color:#000000;
+    background-repeat: no-repeat;
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
     color:white;
@@ -98,9 +98,6 @@
         border-radius: 10px;
       }
       .el-icon-caret-bottom {
-        /*position: absolute;*/
-        /*right: 0px;*/
-        /*top: 25px;*/
         font-size: 12px;
       }
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f1ae191..daf44ff 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -92,16 +92,18 @@
         username: '',
         password: '',
         kaptcha: ''
-      },
+      }, // 登录表单
       loginRules: {
         username: [{ required: true, trigger: ['blur', 'change'], validator: validateUsername }],
         password: [{ required: true, trigger: ['blur', 'change'], validator: validatePass }],
         kaptcha: [{ required: false, trigger: ['blur', 'change'], validator: validateKaptcha }]
-      },
-      loading: false,
-      pwdType: 'password',
-      redirect: '/',
-      showKaptcha: false
+      }, // 登录规则
+      loading: false, // 加载动画
+      pwdType: 'password', // 密码状态password和空
+      redirect: '/', // 重定向路径
+      showKaptcha: false, // 是否显示验证码
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
@@ -123,7 +125,7 @@
         rightHeight = parseFloat(rightHeight.substring(0, rightHeight.length - 2))
         document.getElementById('left-div').style.height = (rightHeight + 64.897) + 'px'
       }
-    }).catch((e) => {
+    }).catch(() => {
       this.$message.error('连接服务器失败')
       this.loading = false
     })
@@ -164,8 +166,8 @@
             this.loading = false
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
-          }).catch((error) => {
-            this.$message.error(error)
+          }).catch(() => {
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()
@@ -185,126 +187,128 @@
   $light_gray:#ffffff;
   $dark_gray:#889aa4;
 
-/* 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;
+  /* reset element-ui css */
+  .login-container {
+    .el-input {
+      display: inline-block;
       height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
+      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;
+      background: #ffffff;
+      border-radius: 5px;
+      color: #000000;
+    }
+    .el-button {
+      line-height:1.2;
+    }
   }
-  .el-form-item {
-    border: 1px solid #c5c5c5;
-    background: #ffffff;
-    border-radius: 5px;
-    color: #000000;
-  }
-  .el-button {
-    line-height:1.2;
-  }
-}
 
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-$bg:#FFFFFF;
-$dark_gray:#889aa4;
-$light_gray:#fff;
-.login-container {
-  position: relative;
-  height: 100%;
-  width: 100%;
-  background: #000000 url("/static/images/login_images/bg.png") no-repeat;
-  -webkit-background-size: 100% 100%;
-  background-size: 100% 100%;
-  background-color: $bg;
-  .login-div{
-    /*height:385px;*/
-    width:800px;
-    position:absolute;
-    overflow:hidden;
-    left:50%;
-    top:50%;
-    margin-left:-400px;
-    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);
-  }
-  .left-div{
-    width:60%;
-    float:left;
-    background: url("/static/images/login_images/left.jpg");
-    background-color: #ffffffff;
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:40%;
-    float:left;
-    background-color:white
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    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;
+  $bg:#FFFFFF;
+  $dark_gray:#889aa4;
+  $light_gray:#fff;
+  .login-container {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    /*background: #000000 url("/static/images/login_images/bg.png") no-repeat;*/
+    background-color: #000000;
+    background-repeat: no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-color: $bg;
+    .login-div{
+      /*height:385px;*/
+      width:800px;
+      position:absolute;
+      overflow:hidden;
+      left:50%;
+      top:50%;
+      margin-left:-400px;
+      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);
+    }
+    .left-div{
+      width:60%;
+      float:left;
+      /*background: url("/static/images/login_images/left.jpg");*/
+      background-color: #ffffffff;
+    }
+    .title-div{
+      margin:20px 30px 30px 30px;
+    }
+    .title{
+      color:$light_gray;
+      font-size: 26px;
+      font-weight: 400;
+    }
+    .right-div{
+      width:40%;
+      float:left;
+      background-color:white
+    }
+    .clear-div{
+      clear:both;
+    }
+    .login-form {
+      max-width: 100%;
+      padding: 15px 15px 5px 15px;
+      margin: auto;
+      overflow:hidden;
+      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: 18px;
+      font-weight: 400;
+      color: #000;
+      margin: 10px auto 30px auto;
+      text-align: center;
+    }
+    .show-pwd {
+      position: absolute;
+      right: 10px;
+      top: 7px;
+      font-size: 16px;
+      color: $dark_gray;
+      cursor: pointer;
+      user-select: none;
+    }
   }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 18px;
-    font-weight: 400;
-    color: #000;
-    margin: 10px auto 30px auto;
-    text-align: center;
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
-  }
-}
 </style>

diff --git a/src/api/area.js b/src/api/area.js
index a5a6b0d..ee118ec 100644
--- a/src/api/area.js
+++ b/src/api/area.js
@@ -3,15 +3,14 @@
  */
 import request from '@/utils/request'
 // 区域查询
-export function getAreaList(pid) {
+export function getAreaListPage(params) {
   return request({
-    url: 'area/list',
+    url: 'area/listPage',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
+
 // 根据部门找其默认区域
 export function getAreaByDept(deptid) {
   return request({
@@ -22,6 +21,16 @@
     }
   })
 }
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: 'area/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
 
 // 区域查询,非分页，加载树用
 export function getAreaTree(params) {
diff --git a/src/api/role.js b/src/api/role.js
index 9b76539..a4759cc 100644
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -84,3 +84,12 @@
     }
   })
 }
+
+
+// 角色类型列表
+export function getDataScopeTypeList() {
+  return request({
+    url: 'dict/code/dataScopeType',
+    method: 'get'
+  })
+}
diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png
new file mode 100644
index 0000000..4d694a8
--- /dev/null
+++ b/src/assets/global_images/header.png
Binary files differ
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 85427e4..6326221 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-header">
+  <div :style="{backgroundImage:'url('+headerUrl+')'}" class="app-header">
     <h3>{{ title }}</h3>
-
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -38,7 +37,8 @@
     return {
       title: getProject().title,
       name: this.$store.getters.name,
-      showSetPwd: false
+      showSetPwd: false,
+      headerUrl: require('../../../assets/global_images/header.png')// 头部图片
     }
   },
   computed: {
@@ -67,8 +67,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-header{
     height:60px;
-    /*background-color:rgb(48, 65, 86);*/
-    background: #000000 url("/static/images/global_images/header.png") no-repeat;
+    background-color:#000000;
+    background-repeat: no-repeat;
     -webkit-background-size: 100% 100%;
     background-size: 100% 100%;
     color:white;
@@ -98,9 +98,6 @@
         border-radius: 10px;
       }
       .el-icon-caret-bottom {
-        /*position: absolute;*/
-        /*right: 0px;*/
-        /*top: 25px;*/
         font-size: 12px;
       }
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f1ae191..daf44ff 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
 <!--登陆主页-->
 <template>
-  <div class="login-container">
+  <div :style="{backgroundImage:'url('+bgUrl+')'}" class="login-container">
     <div class="login-div">
-      <div id="left-div" class="left-div">
+      <div id="left-div" :style="{backgroundImage:'url('+leftUrl+')'}" class="left-div">
         <div class="logo-div">
           <img>
         </div>
@@ -92,16 +92,18 @@
         username: '',
         password: '',
         kaptcha: ''
-      },
+      }, // 登录表单
       loginRules: {
         username: [{ required: true, trigger: ['blur', 'change'], validator: validateUsername }],
         password: [{ required: true, trigger: ['blur', 'change'], validator: validatePass }],
         kaptcha: [{ required: false, trigger: ['blur', 'change'], validator: validateKaptcha }]
-      },
-      loading: false,
-      pwdType: 'password',
-      redirect: '/',
-      showKaptcha: false
+      }, // 登录规则
+      loading: false, // 加载动画
+      pwdType: 'password', // 密码状态password和空
+      redirect: '/', // 重定向路径
+      showKaptcha: false, // 是否显示验证码
+      bgUrl: require('../../assets/login_images/bg.png'), // 背景图片
+      leftUrl: require('../../assets/login_images/left.jpg')// 左边图片
     }
   },
   watch: {
@@ -123,7 +125,7 @@
         rightHeight = parseFloat(rightHeight.substring(0, rightHeight.length - 2))
         document.getElementById('left-div').style.height = (rightHeight + 64.897) + 'px'
       }
-    }).catch((e) => {
+    }).catch(() => {
       this.$message.error('连接服务器失败')
       this.loading = false
     })
@@ -164,8 +166,8 @@
             this.loading = false
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
-          }).catch((error) => {
-            this.$message.error(error)
+          }).catch(() => {
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()
@@ -185,126 +187,128 @@
   $light_gray:#ffffff;
   $dark_gray:#889aa4;
 
-/* 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;
+  /* reset element-ui css */
+  .login-container {
+    .el-input {
+      display: inline-block;
       height: 40px;
-      &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $light_gray inset !important;
-        -webkit-text-fill-color: $dark_gray !important;
+      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;
+      background: #ffffff;
+      border-radius: 5px;
+      color: #000000;
+    }
+    .el-button {
+      line-height:1.2;
+    }
   }
-  .el-form-item {
-    border: 1px solid #c5c5c5;
-    background: #ffffff;
-    border-radius: 5px;
-    color: #000000;
-  }
-  .el-button {
-    line-height:1.2;
-  }
-}
 
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-$bg:#FFFFFF;
-$dark_gray:#889aa4;
-$light_gray:#fff;
-.login-container {
-  position: relative;
-  height: 100%;
-  width: 100%;
-  background: #000000 url("/static/images/login_images/bg.png") no-repeat;
-  -webkit-background-size: 100% 100%;
-  background-size: 100% 100%;
-  background-color: $bg;
-  .login-div{
-    /*height:385px;*/
-    width:800px;
-    position:absolute;
-    overflow:hidden;
-    left:50%;
-    top:50%;
-    margin-left:-400px;
-    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);
-  }
-  .left-div{
-    width:60%;
-    float:left;
-    background: url("/static/images/login_images/left.jpg");
-    background-color: #ffffffff;
-  }
-  .title-div{
-    margin:20px 30px 30px 30px;
-  }
-  .title{
-    color:$light_gray;
-    font-size: 26px;
-    font-weight: 400;
-  }
-  .right-div{
-    width:40%;
-    float:left;
-    background-color:white
-  }
-  .clear-div{
-    clear:both;
-  }
-  .login-form {
-    max-width: 100%;
-    padding: 15px 15px 5px 15px;
-    margin: auto;
-    overflow:hidden;
-    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;
+  $bg:#FFFFFF;
+  $dark_gray:#889aa4;
+  $light_gray:#fff;
+  .login-container {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    /*background: #000000 url("/static/images/login_images/bg.png") no-repeat;*/
+    background-color: #000000;
+    background-repeat: no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-color: $bg;
+    .login-div{
+      /*height:385px;*/
+      width:800px;
+      position:absolute;
+      overflow:hidden;
+      left:50%;
+      top:50%;
+      margin-left:-400px;
+      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);
+    }
+    .left-div{
+      width:60%;
+      float:left;
+      /*background: url("/static/images/login_images/left.jpg");*/
+      background-color: #ffffffff;
+    }
+    .title-div{
+      margin:20px 30px 30px 30px;
+    }
+    .title{
+      color:$light_gray;
+      font-size: 26px;
+      font-weight: 400;
+    }
+    .right-div{
+      width:40%;
+      float:left;
+      background-color:white
+    }
+    .clear-div{
+      clear:both;
+    }
+    .login-form {
+      max-width: 100%;
+      padding: 15px 15px 5px 15px;
+      margin: auto;
+      overflow:hidden;
+      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: 18px;
+      font-weight: 400;
+      color: #000;
+      margin: 10px auto 30px auto;
+      text-align: center;
+    }
+    .show-pwd {
+      position: absolute;
+      right: 10px;
+      top: 7px;
+      font-size: 16px;
+      color: $dark_gray;
+      cursor: pointer;
+      user-select: none;
+    }
   }
-  .svg-container {
-    padding: 0px 3px 0px 10px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-  }
-  .login-title {
-    font-size: 18px;
-    font-weight: 400;
-    color: #000;
-    margin: 10px auto 30px auto;
-    text-align: center;
-  }
-  .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/area/listArea.vue b/src/views/system/area/listArea.vue
index 1d73f81..c52871d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { getAreaList, delArea } from '@/api/area'
+import { getAreaListPage, delArea } from '@/api/area'
 import EditArea from './editArea'
 
 export default {
@@ -157,7 +157,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAreaList(this.listQuery).then(response => {
+      getAreaListPage(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false