From d63b6ed95327800f4525b1d7d8a0d1ae07099d7c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 06 十一月 2023 14:40:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zwf/style
---
package-lock.json | 9 +++++++++
package.json | 1 +
src/components/layout/components/appHeader/index.vue | 25 ++++++++++++++++++++++---
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2c51123..7686237 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
"docx-preview": "^0.1.18",
"downloadjs": "^1.4.7",
"element-ui": "^2.15.13",
+ "js-cookie": "^3.0.5",
"vue": "^2.6.14",
"vue-router": "^3.5.1",
"vuex": "^3.6.2"
@@ -6865,6 +6866,14 @@
"@sideway/pinpoint": "^2.0.0"
}
},
+ "node_modules/js-cookie": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+ "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/js-message": {
"version": "1.0.7",
"resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
diff --git a/package.json b/package.json
index 451674e..69f1fc5 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
"docx-preview": "^0.1.18",
"downloadjs": "^1.4.7",
"element-ui": "^2.15.13",
+ "js-cookie": "^3.0.5",
"vue": "^2.6.14",
"vue-router": "^3.5.1",
"vuex": "^3.6.2"
diff --git a/src/components/layout/components/appHeader/index.vue b/src/components/layout/components/appHeader/index.vue
index 5718bf9..c793bd8 100644
--- a/src/components/layout/components/appHeader/index.vue
+++ b/src/components/layout/components/appHeader/index.vue
@@ -2,18 +2,19 @@
<div class="sales-lead">
<div class="header-title">{{ headerTitle }}</div>
<div class="header-user-info">
- <!-- <div class="avatar"><el-avatar icon="el-icon-user-solid"></el-avatar></div>
+ <div class="avatar"><el-avatar icon="el-icon-user-solid"></el-avatar></div>
<el-dropdown @command="handleCommand">
<div class="el-dropdown-link">鐢ㄦ埛鍚�<i class="el-icon-arrow-down el-icon--right"></i></div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="logout">閫�鍑�</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown> -->
+ </el-dropdown>
</div>
</div>
</template>
<script>
+import Cookies from "js-cookie"
export default {
name: "SalesLead",
props: {
@@ -26,7 +27,25 @@
handleCommand(command) {
console.log(command)
if (command === "logout") {
- this.$router.push({ path: "/login" })
+ // this.$router.push({ path: "/login" })
+ document.cookie = "cookieName=; path=/;";
+ this.$confirm('纭畾瑕佹敞閿�褰撳墠鐢ㄦ埛鍚�?', '娉ㄩ攢鐢ㄦ埛', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ Cookies.remove('token')
+ window.location.href = 'http://localhost:8080/login'; //鏈湴鐨勬櫤鎱у伐鍘�-鐧诲綍椤�
+ this.$message({
+ type: 'success',
+ message: '娉ㄩ攢鎴愬姛!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堟敞閿�'
+ });
+ });
}
}
}
--
Gitblit v1.8.0