From 9bfe3904c406621bdf20e6977ebe6f3680e4255f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E5=AD=90=E6=9D=8E=C2=B7De?= <lide1202@hotmail.com>
Date: Wed, 7 Jul 2021 17:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/mixins/access.js                |   4 +
 .../src/views/layout/components/Navbar.vue    | 135 +++++++++---------
 2 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/report-ui/src/mixins/access.js b/report-ui/src/mixins/access.js
index 805c9bb7..c32a39ac 100644
--- a/report-ui/src/mixins/access.js
+++ b/report-ui/src/mixins/access.js
@@ -6,6 +6,10 @@ export default {
     }
   },
   computed: {
+    username: function(){
+      var username = getItem('username')
+      return username
+    },
     getUser: function(){
       // var user = getItem('user');
       var user =JSON.parse(localStorage.getItem('user')) 
diff --git a/report-ui/src/views/layout/components/Navbar.vue b/report-ui/src/views/layout/components/Navbar.vue
index 10d5449f..05b0ece3 100644
--- a/report-ui/src/views/layout/components/Navbar.vue
+++ b/report-ui/src/views/layout/components/Navbar.vue
@@ -1,16 +1,12 @@
 <template>
   <div>
     <el-menu class="navbar" mode="horizontal">
-      <hamburger
-        :toggle-click="toggleSideBar"
-        :is-active="sidebar.opened"
-        class="hamburger-container"
-      />
+      <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container" />
       <breadcrumb />
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <i class="icon iconfont iconyonghu user" />
-          <span class="user-name">{{ userName }}</span>
+          <span class="user-name">{{ username }}</span>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
@@ -24,25 +20,25 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import Breadcrumb from "@/components/Breadcrumb";
-import Hamburger from "@/components/Hamburger";
-import { getItem, delItem, getStorageItem } from "@/utils/storage";
-import { aesEncrypt } from "@/utils/aes";
-import { reqUpdatePassword } from "@/api/login";
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import Hamburger from '@/components/Hamburger'
+import { getItem, delItem, getStorageItem } from '@/utils/storage'
+import { aesEncrypt } from '@/utils/aes'
+import { reqUpdatePassword } from '@/api/login'
 
 export default {
   data() {
     // 确认密码
     var validatePass3 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"));
+      if (value === '') {
+        callback(new Error('请再次输入密码'))
       } else if (value !== this.form.password) {
-        callback(new Error("两次输入密码不一致!"));
+        callback(new Error('两次输入密码不一致!'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     // const validatePass = (rule, value, callback) => {
     // 	if (!/^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_]+$)(?![a-z0-9]+$)(?![a-z\W_]+$)(?![0-9\W_]+$)[a-zA-Z0-9\W_]{6,}$/.test(value)) {
     // 		callback(new Error('请按要求输入密码'))
@@ -52,103 +48,100 @@ export default {
     // };
     const validateOldPass = (rule, value, callback) => {
       if (value.length < 6 || value.length > 30) {
-        callback(new Error("请输入原密码"));
+        callback(new Error('请输入原密码'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     return {
-      userName: "",
       wordVisible: false, //修改密码弹框
       form: {
-        oldPassword: "",
-        password: "",
-        confirmPassword: ""
+        oldPassword: '',
+        password: '',
+        confirmPassword: '',
       },
       rules: {
         oldPassword: [
-          { required: true, validator: validateOldPass, trigger: "blur" }
+          { required: true, validator: validateOldPass, trigger: 'blur' },
         ],
         password: [
-          { required: true, message: "请选择新密码", trigger: "blur" }
+          { required: true, message: '请选择新密码', trigger: 'blur' },
         ],
         confirmPassword: [
-          { required: true, validator: validatePass3, trigger: "blur" }
-        ]
-      }
-    };
+          { required: true, validator: validatePass3, trigger: 'blur' },
+        ],
+      },
+    }
   },
   components: {
     Breadcrumb,
-    Hamburger
+    Hamburger,
   },
   computed: {
-    ...mapGetters(["sidebar"])
-  },
-  created() {
-    this.userName = getItem("username");
+    ...mapGetters(['sidebar']),
   },
+  created() {},
   methods: {
     toggleSideBar() {
-      this.$store.dispatch("ToggleSideBar");
+      this.$store.dispatch('ToggleSideBar')
     },
     logout() {
-      this.$confirm("确定要退出吗", "温馨提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定要退出吗', '温馨提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       }).then(() => {
-        delItem("token");
-        sessionStorage.clear();
-        localStorage.clear();
-        this.$router.push("/login");
-      });
+        delItem('token')
+        sessionStorage.clear()
+        localStorage.clear()
+        this.$router.push('/login')
+      })
     },
     // 修改密码
     updatePassword() {
-      this.wordVisible = true;
+      this.wordVisible = true
       this.$nextTick(() => {
-        this.$refs.form && this.$refs.form.resetFields();
-      });
+        this.$refs.form && this.$refs.form.resetFields()
+      })
     },
     // 发送请求 确认修改
     confrimUpdate() {
-      this.$refs.form.validate(valid => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
-          const { oldPassword, password, confirmPassword } = this.form;
+          const { oldPassword, password, confirmPassword } = this.form
           let data = {
             oldPassword: aesEncrypt(oldPassword),
             password: aesEncrypt(password),
-            confirmPassword: aesEncrypt(confirmPassword)
-          };
-          reqUpdatePassword(data).then(res => {
-            if (res.repCode == "0000") {
-              this.wordVisible = false;
-              this.$message.success("修改密码成功,请重新登录");
-              sessionStorage.clear();
-              localStorage.clear();
-              delItem("token");
-              this.$router.push("/login");
+            confirmPassword: aesEncrypt(confirmPassword),
+          }
+          reqUpdatePassword(data).then((res) => {
+            if (res.repCode == '0000') {
+              this.wordVisible = false
+              this.$message.success('修改密码成功,请重新登录')
+              sessionStorage.clear()
+              localStorage.clear()
+              delItem('token')
+              this.$router.push('/login')
             }
-          });
+          })
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     helpCenter() {
-      let helpCategory = JSON.parse(localStorage.getItem("helpCategory"));
+      let helpCategory = JSON.parse(localStorage.getItem('helpCategory'))
       this.$router.push({
-        path: "/helpCenList/list",
+        path: '/helpCenList/list',
         query: {
           id: 0,
           val: helpCategory[0].value,
-          title: helpCategory[0].label
-        }
-      });
-    }
-  }
-};
+          title: helpCategory[0].label,
+        },
+      })
+    },
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>