From 9f82f4a5cbc86dbba5c6ced881555b007f314a0c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 01 二月 2021 15:41:48 +0800
Subject: [PATCH] 修复自动登录手动退出后的操作

---
 src/pages/desktop/index/components/Tools.vue |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/pages/desktop/index/components/Tools.vue b/src/pages/desktop/index/components/Tools.vue
index f968873..3ae05c9 100644
--- a/src/pages/desktop/index/components/Tools.vue
+++ b/src/pages/desktop/index/components/Tools.vue
@@ -73,10 +73,10 @@
 
 <script>
 import html2canvas from 'html2canvas';
-import { logout,updatePwd } from "@/api/login";
+import { logout, updatePwd } from "@/api/login";
 export default {
   name: "Tools",
-  data () {
+  data() {
     var validatePass = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('璇疯緭鍏ュ瘑鐮�'));
@@ -104,9 +104,9 @@
       maxOrderOne: '',
       userInfo: {},
       showPasswdForm: false,
-      rules:{
+      rules: {
         oldPwd: [
-          {required: true, message: '璇疯緭鍏ユ棫瀵嗙爜', trigger: 'blur'}
+          { required: true, message: '璇疯緭鍏ユ棫瀵嗙爜', trigger: 'blur' }
         ],
         newPwd: [
           { required: true, validator: validatePass, trigger: 'blur' }
@@ -123,7 +123,7 @@
 
     };
   },
-  created () {
+  created() {
     let _that = this;
     this.userInfo = sessionStorage.getItem("userInfo") && JSON.parse(sessionStorage.getItem("userInfo"));
     console.log(this.userInfo)
@@ -162,13 +162,13 @@
             oldPwd: this.passwdForm.oldPwd,
             newPwd: this.passwdForm.checkPwd
           }
-          updatePwd(json).then(res=>{
-            console.log(res,'淇敼瀵嗙爜')
+          updatePwd(json).then(res => {
+            console.log(res, '淇敼瀵嗙爜')
             this.$notify({
-              type:res.success?'success':'error',
-              message:res.msg
+              type: res.success ? 'success' : 'error',
+              message: res.msg
             })
-            if(res.success){
+            if (res.success) {
               this.showPasswdForm = false
               // this.$nextTick(_=>{
               //   this.toLogout('淇敼瀵嗙爜鎴愬姛锛岃閲嶆柊鐧诲綍锛�')
@@ -198,7 +198,7 @@
       );
     },
 
-    togglePreference () {
+    togglePreference() {
       //this.$store.commit("desktop/togglePreference");
       //鏄剧ず妗岄潰,鏈�灏忓寲宸叉墦寮�鐨勫簲鐢�
       ;
@@ -212,7 +212,7 @@
         });
       })
     },
-    dockClick (dock) {
+    dockClick(dock) {
 
       if (dock.type === "1") {
         window.open(dock.url);
@@ -229,11 +229,11 @@
         this.$store.commit("desktop/refreshFrame", dock);
       }
     },
-    toolHover (dock) {
+    toolHover(dock) {
       //this.$parent.screenShot(dock)
     },
 
-    toLogout () {
+    toLogout() {
       let _this = this;
       this.$confirm("鎻愮ず锛氱‘瀹氶��鍑哄悧锛�", {
         center: true,
@@ -243,6 +243,8 @@
         logout().then(res => {
           if (res === "閫�鍑烘垚鍔�") {
             sessionStorage.removeItem("userInfo");
+            // 鎵嬪姩閫�鍑�, 鍙栨秷鑷姩鐧诲綍
+            sessionStorage.removeItem("autoLogin");
             _this.userInfo = {};
             location.assign('/view/index');
             this.$notify({
@@ -297,7 +299,7 @@
 .tools .tools-middle::before {
   width: 1px;
   height: 20px;
-  content: '';
+  content: "";
   position: absolute;
   top: 10px;
   left: 0;

--
Gitblit v1.8.0