diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index de07ead..c05fbae 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="avue-logo">
-    <transition name="fade">
+    <!-- <transition name="fade">
       <span v-if="keyCollapse"
             class="avue-logo_subtitle"
             key="0">
@@ -12,7 +12,9 @@
         <span class="avue-logo_title"
               key="1">{{website.indexTitle}} </span>
       </template>
-    </transition-group>
+    </transition-group> -->
+    <div class="logo">logo</div>
+    <div class="title">运维管理系统</div>
   </div>
 </template>
 
@@ -47,27 +49,23 @@ export default {
   top: 0;
   left: 0;
   width: 240px;
-  height: 64px;
+  height: 92px;
   line-height: 64px;
-  background-color: #20222a;
   font-size: 20px;
   overflow: hidden;
   box-sizing: border-box;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
   color: rgba(255, 255, 255, 0.8);
   z-index: 1024;
-  &_title {
-    display: block;
-    text-align: center;
-    font-weight: 300;
-    font-size: 20px;
+  display: flex;
+  .logo {
+    width: 90px;
+    background: skyblue;
   }
-  &_subtitle {
-    display: block;
-    text-align: center;
-    font-size: 18px;
-    font-weight: bold;
-    color: #fff;
+  .title {
+    line-height: 92px;
+    font-size: 20px;
+    padding-left: 10px;
+    box-sizing: border-box;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 91a14c4..6ca2d88 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -2,17 +2,64 @@
   <div class="avue-top">
     <div class="top-left">{{tag.label}}</div>
     <div class="top-right">
-      <div class="avatar"></div>
-      <i class="el-icon-arrow-down"></i>
+      <div class="avatar">
+        <img :src="userInfo.avatar" alt="" width="56px" height="56px">
+      </div>
+      <el-dropdown >
+        <span class="el-dropdown-link">
+          <i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>
+            <router-link to="/info/index">{{$t('navbar.userinfo')}}</router-link>
+          </el-dropdown-item>
+          <el-dropdown-item v-if="this.website.switchMode" @click.native="switchDept"
+                            >{{$t('navbar.switchDept')}}
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="logout"
+                            divided>{{$t('navbar.logOut')}}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
   </div>
 </template>
 <script>
 import { mapGetters } from "vuex";
+import { resetRouter } from '@/router/router'
 export default {
+  name: "top",
+  data () {
+    return {
+    }
+  },
+  filters: {},
+  created () {
+  },
+  mounted () {
+    console.log(this.userInfo)
+  },
   computed: {
-    ...mapGetters(["tagWel", "tagList", "tag", "website"]),
+    ...mapGetters([
+      "userInfo",
+      "tag",
+    ])
   },
+  methods: {
+    logout () {
+      this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
+        confirmButtonText: this.$t("submitText"),
+        cancelButtonText: this.$t("cancelText"),
+        type: "warning"
+      }).then(() => {
+        this.$store.dispatch("LogOut").then(() => {
+          resetRouter()
+          this.$router.push({ path: "/login" })
+        })
+      })
+    }
+
+  }
 };
 </script>
 
@@ -29,8 +76,8 @@ export default {
     width: 56px;
     height: 56px;
     border-radius: 50%;
-    background: skyblue;
     margin-right: 18px;
+    border: 2px solid #fff;
   }
   i {
     font-style: normal;
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 935d5c9..a30d306 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -1,12 +1,13 @@
 <template>
-  <el-form class="login-form"
-           status-icon
-           :rules="loginRules"
-           ref="loginForm"
-           :model="loginForm"
-           label-width="0"
-           label-position="top"
-           >
+  <el-form
+    class="login-form"
+    status-icon
+    :rules="loginRules"
+    ref="loginForm"
+    :model="loginForm"
+    label-width="0"
+    label-position="top"
+  >
     <!-- <el-form-item v-if="tenantMode" prop="tenantId" label="用户名">
       <el-input size="small"
                 @keyup.enter.native="handleLogin"
@@ -16,21 +17,29 @@
       </el-input>
     </el-form-item> -->
     <el-form-item prop="username" label="用户名">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.username"
-                auto-complete="off"
-                :placeholder="$t('login.username')">
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.username"
+        auto-complete="off"
+        :placeholder="$t('login.username')"
+      >
       </el-input>
     </el-form-item>
     <el-form-item prop="password" label="密码">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                :type="passwordType"
-                v-model="loginForm.password"
-                auto-complete="off"
-                :placeholder="$t('login.password')">
-        <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        :type="passwordType"
+        v-model="loginForm.password"
+        auto-complete="off"
+        :placeholder="$t('login.password')"
+      >
+        <i
+          class="el-icon-view el-input__icon"
+          slot="suffix"
+          @click="showPassword"
+        />
       </el-input>
     </el-form-item>
     <div><el-checkbox v-model="rememberPwd">记住密码</el-checkbox></div>
@@ -54,179 +63,209 @@
       </el-row>
     </el-form-item> -->
     <el-form-item>
-      <el-button type="primary"
-                 size="small"
-                 @click.native.prevent="handleLogin"
-                 class="login-submit">{{$t('login.submit')}}
+      <el-button
+        type="primary"
+        size="small"
+        @click.native.prevent="handleLogin"
+        class="login-submit"
+        >{{ $t("login.submit") }}
       </el-button>
     </el-form-item>
-    <el-dialog title="用户信息选择"
-               append-to-body
-               :visible.sync="userBox"
-               width="350px">
-      <avue-form :option="userOption" v-model="userForm" @submit="submitLogin"/>
+    <el-dialog
+      title="用户信息选择"
+      append-to-body
+      :visible.sync="userBox"
+      width="350px"
+    >
+      <avue-form
+        :option="userOption"
+        v-model="userForm"
+        @submit="submitLogin"
+      />
     </el-dialog>
   </el-form>
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
-  import {info} from "@/api/system/tenant";
-  import {getCaptcha} from "@/api/user";
-  import {getTopUrl} from "@/util/util";
-
-  export default {
-    name: "userlogin",
-    data() {
-      return {
-        tenantMode: this.website.tenantMode,
-        rememberPwd: false,
-        loginForm: {
-          //租户ID
-          tenantId: "000000",
-          //部门ID
-          deptId: "",
-          //角色ID
-          roleId: "",
-          //用户名
-          username: "admin",
-          //密码
-          password: "admin",
-          //账号类型
-          type: "account",
-          //验证码的值
-          code: "",
-          //验证码的索引
-          key: "",
-          //预加载白色背景
-          image: "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
-        },
-        loginRules: {
-          // tenantId: [
-          //   {required: false, message: "请输入租户ID", trigger: "blur"}
-          // ],
-          username: [
-            {required: true, message: "请输入用户名", trigger: "blur"}
-          ],
-          password: [
-            {required: true, message: "请输入密码", trigger: "blur"},
-            {min: 1, message: "密码长度最少为6位", trigger: "blur"}
-          ]
-        },
-        passwordType: "password",
-        userBox: false,
-        userForm: {
-          deptId: '',
-          roleId: ''
-        },
-        userOption: {
-          labelWidth: 70,
-          submitBtn: true,
-          emptyBtn: false,
-          submitText: '登录',
-          column: [
-            {
-              label: '部门',
-              prop: 'deptId',
-              type: 'select',
-              props: {
-                label: 'deptName',
-                value: 'id'
-              },
-              dicUrl: '/api/blade-system/dept/select',
-              span: 24,
-              display: false,
-              rules: [{
+import { mapGetters } from "vuex";
+import { info } from "@/api/system/tenant";
+import { getCaptcha } from "@/api/user";
+import { getTopUrl } from "@/util/util";
+import { Base64 } from 'js-base64';
+export default {
+  name: "userlogin",
+  data() {
+    return {
+      tenantMode: this.website.tenantMode,
+      rememberPwd: false,
+      loginForm: {
+        //租户ID
+        tenantId: "000000",
+        //部门ID
+        deptId: "",
+        //角色ID
+        roleId: "",
+        //用户名
+        username: "",
+        //密码
+        password: "",
+        //账号类型
+        type: "account",
+        //验证码的值
+        code: "",
+        //验证码的索引
+        key: "",
+        //预加载白色背景
+        image:
+          "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
+      },
+      loginRules: {
+        // tenantId: [
+        //   {required: false, message: "请输入租户ID", trigger: "blur"}
+        // ],
+        username: [
+          { required: true, message: "请输入用户名", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          { min: 1, message: "密码长度最少为6位", trigger: "blur" },
+        ],
+      },
+      passwordType: "password",
+      userBox: false,
+      userForm: {
+        deptId: "",
+        roleId: "",
+      },
+      userOption: {
+        labelWidth: 70,
+        submitBtn: true,
+        emptyBtn: false,
+        submitText: "登录",
+        column: [
+          {
+            label: "部门",
+            prop: "deptId",
+            type: "select",
+            props: {
+              label: "deptName",
+              value: "id",
+            },
+            dicUrl: "/api/blade-system/dept/select",
+            span: 24,
+            display: false,
+            rules: [
+              {
                 required: true,
                 message: "请选择部门",
-                trigger: "blur"
-              }],
-            },
-            {
-              label: '角色',
-              prop: 'roleId',
-              type: 'select',
-              props: {
-                label: 'roleName',
-                value: 'id'
+                trigger: "blur",
               },
-              dicUrl: '/api/blade-system/role/select',
-              span: 24,
-              display: false,
-              rules: [{
+            ],
+          },
+          {
+            label: "角色",
+            prop: "roleId",
+            type: "select",
+            props: {
+              label: "roleName",
+              value: "id",
+            },
+            dicUrl: "/api/blade-system/role/select",
+            span: 24,
+            display: false,
+            rules: [
+              {
                 required: true,
                 message: "请选择角色",
-                trigger: "blur"
-              }],
-            },
-          ]
-        }
-      };
-    },
-    created() {
-      this.getTenant();
-      this.refreshCode();
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getTenant();
+    this.refreshCode();
+  },
+  mounted() {
+    let username = localStorage.getItem("username");
+    if (username) {
+      this.loginForm.username = localStorage.getItem("username");
+      this.loginForm.password = Base64.decode(localStorage.getItem("password")); // base64解密
+      this.rememberPwd = true;
+    }
+  },
+  watch: {
+    "loginForm.deptId"() {
+      const column = this.findObject(this.userOption.column, "deptId");
+      if (this.loginForm.deptId.includes(",")) {
+        column.dicUrl = `/api/blade-system/dept/select?deptId=${this.loginForm.deptId}`;
+        column.display = true;
+      } else {
+        column.dicUrl = "";
+      }
     },
-    mounted() {
+    "loginForm.roleId"() {
+      const column = this.findObject(this.userOption.column, "roleId");
+      if (this.loginForm.roleId.includes(",")) {
+        column.dicUrl = `/api/blade-system/role/select?roleId=${this.loginForm.roleId}`;
+        column.display = true;
+      } else {
+        column.dicUrl = "";
+      }
     },
-    watch: {
-      'loginForm.deptId'() {
-        const column = this.findObject(this.userOption.column, "deptId");
-        if (this.loginForm.deptId.includes(",")) {
-          column.dicUrl = `/api/blade-system/dept/select?deptId=${this.loginForm.deptId}`;
-          column.display = true;
-        } else {
-          column.dicUrl = '';
-        }
-      },
-      'loginForm.roleId'() {
-        const column = this.findObject(this.userOption.column, "roleId");
-        if (this.loginForm.roleId.includes(",")) {
-          column.dicUrl = `/api/blade-system/role/select?roleId=${this.loginForm.roleId}`;
-          column.display = true;
-        } else {
-          column.dicUrl = '';
-        }
+  },
+  computed: {
+    ...mapGetters(["tagWel", "userInfo"]),
+  },
+  props: [],
+  methods: {
+    refreshCode() {
+      if (this.website.captchaMode) {
+        getCaptcha().then((res) => {
+          const data = res.data;
+          this.loginForm.key = data.key;
+          this.loginForm.image = data.image;
+        });
       }
     },
-    computed: {
-      ...mapGetters(["tagWel", "userInfo"])
+    showPassword() {
+      this.passwordType === ""
+        ? (this.passwordType = "password")
+        : (this.passwordType = "");
     },
-    props: [],
-    methods: {
-      refreshCode() {
-        if (this.website.captchaMode) {
-          getCaptcha().then(res => {
-            const data = res.data;
-            this.loginForm.key = data.key;
-            this.loginForm.image = data.image;
-          })
-        }
-      },
-      showPassword() {
-        this.passwordType === ""
-          ? (this.passwordType = "password")
-          : (this.passwordType = "");
-      },
-      submitLogin (form, done) {
-        if (form.deptId !== '') {
-          this.loginForm.deptId = form.deptId;
-        }
-        if (form.roleId !== '') {
-          this.loginForm.roleId = form.roleId;
-        }
-        this.handleLogin();
-        done();
-      },
-      handleLogin() {
-        this.$refs.loginForm.validate(valid => {
-          if (valid) {
-            const loading = this.$loading({
-              lock: true,
-              text: '登录中,请稍后。。。',
-              spinner: "el-icon-loading"
-            });
-            this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
+    submitLogin(form, done) {
+      if (form.deptId !== "") {
+        this.loginForm.deptId = form.deptId;
+      }
+      if (form.roleId !== "") {
+        this.loginForm.roleId = form.roleId;
+      }
+      this.handleLogin();
+      done();
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate((valid) => {
+        if (valid) {
+          /* ------ 账号密码的存储 ------ */
+          if (this.rememberPwd) {
+            let password = Base64.encode(this.loginForm.password); // base64加密
+            localStorage.setItem("username", this.loginForm.username);
+            localStorage.setItem("password", password);
+          } else {
+            localStorage.removeItem("username");
+            localStorage.removeItem("password");
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: "登录中,请稍后。。。",
+            spinner: "el-icon-loading",
+          });
+          this.$store
+            .dispatch("LoginByUsername", this.loginForm)
+            .then(() => {
               if (this.website.switchMode) {
                 const deptId = this.userInfo.dept_id;
                 const roleId = this.userInfo.role_id;
@@ -240,31 +279,77 @@
                   return false;
                 }
               }
-              this.$router.push({path: this.tagWel.value});
+              this.$router.push({ path: this.tagWel.value });
               loading.close();
-            }).catch(() => {
+            })
+            .catch(() => {
               loading.close();
               this.refreshCode();
             });
-          }
-        });
-      },
-      getTenant() {
-        let domain = getTopUrl();
-        // 临时指定域名，方便测试
-        //domain = "https://bladex.vip";
-        info(domain).then(res => {
-          const data = res.data;
-          if (data.success && data.data.tenantId) {
-            this.tenantMode = false;
-            this.loginForm.tenantId = data.data.tenantId;
-            this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;
-          }
-        })
-      }
-    }
-  };
+        }
+      });
+    },
+    getTenant() {
+      let domain = getTopUrl();
+      // 临时指定域名，方便测试
+      //domain = "https://bladex.vip";
+      info(domain).then((res) => {
+        const data = res.data;
+        if (data.success && data.data.tenantId) {
+          this.tenantMode = false;
+          this.loginForm.tenantId = data.data.tenantId;
+          this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;
+        }
+      });
+    },
+  },
+};
 </script>
 
-<style>
+<style lang="scss" scoped>
+.login-submit {
+  width: 100%;
+  height: 50px;
+  background: #2e92f6;
+  font-size: 16px;
+  color: #fff;
+  letter-spacing: 2px;
+  cursor: pointer;
+  margin-top: 50px;
+  font-family: "neo";
+  transition: 0.25s;
+}
+
+.login-form {
+  margin: 10px 0;
+  i {
+    position: absolute;
+    right: 6px;
+  }
+}
+/deep/ .el-input--small .el-input__inner {
+  width: 330px;
+  height: 50px;
+  line-height: 50px;
+  border-radius: 3px 3px 3px 3px;
+  color: #333;
+  position: relative;
+}
+/deep/ .el-form--label-top .el-form-item__label {
+  font-size: 16px;
+  color: #333;
+  padding: 0 !important;
+}
+/deep/ .el-form-item__label:before {
+  display: none;
+}
+/deep/ .el-checkbox__inner {
+  border-color: #999;
+}
+/deep/ .el-checkbox__label {
+  color: #999;
+}
+/deep/ .el-input__validateIcon {
+  display: none;
+}
 </style>
diff --git a/src/styles/login.scss b/src/styles/login.scss
index a96727e..a3860be 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -81,46 +81,3 @@
   margin-bottom: 46px;
 }
 
-.login-submit {
-  width: 100%;
-  height: 50px;
-  background: #2E92F6;
-  font-size: 16px;
-  color: #fff;
-  letter-spacing: 2px;
-  cursor: pointer;
-  margin-top: 50px;
-  font-family: "neo";
-  transition: 0.25s;
-}
-
-.login-form {
-  margin: 10px 0;
-  i {
-    position: absolute;
-    right: 6px;
-  }
-  
-}
- .el-input--small .el-input__inner {
-  width: 330px;
-  height: 50px;
-  line-height: 50px;
-  border-radius: 3px 3px 3px 3px;
-  color: #333;
-  position: relative;
-}
-.el-form--label-top .el-form-item__label {
-  font-size: 16px;
-  color: #333;
-  padding: 0!important;
-}
-.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
-  display: none;
-}
-.el-checkbox__inner {
-  border-color: #999;
-}
-.el-checkbox__label {
-  color: #999;
-}
\ No newline at end of file
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index f4995d7..a349f80 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -32,7 +32,7 @@
 .avue-sidebar {
     user-select: none; 
     position: relative;
-    padding-top: 60px;
+    padding-top: 92px;
     height: 100%;
     position: relative;
     background-color: #20222a;