From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/layout/components/Navbar.vue | 131 +++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 37 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 75fb75b..0fe19aa 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,25 +6,41 @@
<div class="right-menu">
<div class="right-serves">
- <i class="el-icon-setting" />
- <i class="el-icon-bell" />
- <i class="el-icon-time" />
+ <!-- <i class="el-icon-setting" /> -->
+
+ <p @click="toMessage"><el-badge is-dot class="el-icon-bell message-icon"></el-badge></p>
+ <!-- <i class="el-icon-time" /> -->
</div>
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
- <a class="user-avatar">{{ user.name.slice(0,1) }}</a>
+ <a class="user-avatar">{{ user.name.slice(0, 1) }}</a>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
- <router-link to="/">
- <el-dropdown-item>
- 淇敼瀵嗙爜
- </el-dropdown-item>
- </router-link>
+ <el-dropdown-item>
+ <p @click="dialogFormVisible = true">淇敼瀵嗙爜</p>
+ </el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">閫�鍑虹櫥褰�</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
+ <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" :append-to-body="true" width="40%">
+ <el-form :model="form">
+ <el-form-item label="鏃у瘑鐮�" :label-width="formLabelWidth">
+ <el-input v-model="form.oldPwd" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂板瘑鐮�" :label-width="formLabelWidth">
+ <el-input maxlength="30" show-word-limit v-model="form.newPwd" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="纭瀵嗙爜" :label-width="formLabelWidth">
+ <el-input maxlength="30" show-word-limit v-model="form.confirmPwd" autocomplete="off"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="reset()">鍙� 娑�</el-button>
+ <el-button type="primary" @click="editPwd">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
@@ -33,14 +49,33 @@
import { mapGetters } from 'vuex'
// import Breadcrumb from '@/components/Breadcrumb'
// import Hamburger from '@/components/Hamburger'
- import {
- get,
- post,
- wpost,
- postFile
- } from "@/api/util/requestUtil.js"
+import {
+ get,
+ post,
+ wpost,
+ postFile
+} from "@/api/util/requestUtil.js"
export default {
+ data() {
+ return {
+ form: {
+ oldPwd: '',
+ newPwd: '',
+ confirmPwd: ''
+ },
+ user: {
+ id: null,
+ name: 'value'
+ },
+ dialogFormVisible: false,
+ formLabelWidth: '120px',
+ user: {
+ id: null,
+ name: 'value'
+ }
+ }
+ },
components: {
// Breadcrumb,
// Hamburger
@@ -51,30 +86,40 @@
'avatar'
])
},
- data() {
- return {
- user: {
- id: null,
- name: 'value'
- }
- }
- },
- mounted() {
- this.getUser()
- },
+ mounted() {
+ this.getUser()
+ },
methods: {
+ reset() {
+ this.dialogFormVisible = false;
+ this.form.oldPwd = '';
+ this.form.newPwd = '';
+ this.form.confirmPwd = '';
+ },
+ toMessage() {
+ this.$router.push('/message/toDo');
+ },
+ editPwd() {
+ console.log(1);
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
// await this.$store.dispatch('user/logout')
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ sessionStorage.removeItem("user")
+ localStorage.removeItem("autoenter");
+ this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ this.$router.replace({path: '/login'});
+ location.reload();
+
},
- getUser(){
- get(this.$url.info).then(res=>{
- this.user = res.data
- })
- }
+ getUser() {
+ get(this.$url.info).then(res => {
+ this.user = res.data
+ sessionStorage.setItem("user", JSON.stringify(res.data))
+ })
+ }
}
}
</script>
@@ -87,15 +132,24 @@
background: #fff;
display: flex;
border-bottom: 1px solid #f0f2f5;
+
// box-shadow: 0 0 0.857143rem rgba(0, 0, 0, 0.12);
// box-shadow: 0 1px 4px rgba(0,21,41,.08);
+ .message-icon {
+ margin-right: 10px;
+ cursor: pointer;
+ }
+
+ .v-modal {
+ z-index: 8;
+ }
.hamburger-container {
line-height: 46px;
height: 100%;
cursor: pointer;
transition: background .3s;
- -webkit-tap-highlight-color:transparent;
+ -webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
@@ -112,11 +166,13 @@
line-height: 50px;
display: flex;
justify-content: right;
- .right-serves{
+
+ .right-serves {
height: 100%;
display: flex;
align-items: center;
- >i{
+
+ >i {
display: inline-block;
margin: auto 10px;
font-size: 20px;
@@ -149,6 +205,7 @@
.avatar-container {
margin-right: 24px;
height: 100%;
+
.avatar-wrapper {
// margin-top: 5px;
width: 40px;
@@ -157,6 +214,7 @@
display: flex;
align-items: center;
justify-content: center;
+
.user-avatar {
cursor: pointer;
width: 30px;
@@ -180,5 +238,4 @@
}
}
}
-}
-</style>
+}</style>
--
Gitblit v1.9.3