From 29271007d0b124f36e0a9db41b7918de2e008b58 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 30 八月 2023 15:01:23 +0800
Subject: [PATCH] 1.计量单位完成100%
---
src/store/modules/user.js | 114 ++++++++++++++++++++-------------------------------------
1 files changed, 40 insertions(+), 74 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 071da96..11e2fed 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,8 @@
-import { login, logout, getInfo, LoginMenu, LoginMenuCloud } from '@/api/user'
-import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
+import { login, logout, getInfo, LoginMenu } from '@/api/user'
+import { getToken, removeToken, setCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
+import { ButtonData } from '@/api/GeneralBasicData'
+import Vue from 'vue'
const getDefaultState = () => {
return {
@@ -41,28 +43,7 @@
localStorage.setItem('token', res.data)
- // login({ UserName: '001', PassWord: 123, HOrgName: 1 }).then(response => {
- // const { data: res } = response
- // if (res.code === '200') {
- // setCookie('username', res.data.username)
- // setCookie('admin', res.data.usercode)
- // setCookie('navTabId', res.data.usercode)
- // setCookie('usertype', res.data.usertype)
- // setCookie('userid', res.data.userid)
- // setCookie('rediskey', res.data.rediskey)
- // setCookie('guid', res.data.guid)
- // setCookie('stu_torgcode', res.data.stu_torgcode)
- // setCookie('stu_torgname', res.data.stu_torgname)
- // setCookie('description', res.data.description)
- // }
- // console.log(res.code === '302', 8989)
- // if (res.code === '302') {
setCookie('code', res.code)
- // }
- // commit('SET_TOKEN', data.token)
- // setToken(res)
- // commit('SET_TOKEN', res)
- // setToken(res)
resolve()
}).catch(error => {
reject(error)
@@ -90,84 +71,69 @@
})
})
},
+
// get user menu
getMenu({ commit, state }) {
return new Promise((resolve, reject) => {
- console.log('杩涙潵浜�11111')
- // if (getCookie('cloud')) { // 璧颁簯
- // LoginMenuCloud({ enterpriseUserName: getCookie('admin') }).then(res => {
- // if (res.code === 200) {
- // commit('SET_NAME', res.msg)
- // commit('SET_MENU', res.data)
- // resolve(res.data)
- // }
- // }).catch(error => {
- // reject(error)
- // })
- // } else {
- // debugger
- // 鏄庡ぉ鐨勭湅涓媢sercode缂栫爜鍔ㄦ��
- LoginMenu({ usertype: 'PC', usercode: '999' }).then(res => {
+ LoginMenu({
+ usertype: 'PC',
+ usercode: localStorage.getItem('usercode'),
+ torg_code: localStorage.getItem('torg_code')
+ }).then(res => {
if (res.code === '200') {
+ ButtonData().then(res2 => {
+ localStorage.setItem('ButtonData', JSON.stringify(res2.data))
+ })
+
commit('SET_NAME', res.message)
commit('SET_MENU', res.data)
resolve(res.data)
}
- // if (res.code === '303') {
- // debugger
- // localStorage.removeItem('token')
- // // window.location.reload()
- // // resolve(res.data)
- // }
}).catch(error => {
reject(error)
})
- // }
})
},
// user logout
logout({ commit, state, dispatch }) {
return new Promise((resolve, reject) => {
- const usercode = getCookie('navTabId')
- const username = getCookie('admin')
- const usertype = getCookie('usertype')
- const userid = getCookie('userid')
- const stu_torgcode = getCookie('stu_torgcode')
- const data = {
- usercode,
- username,
- usertype,
- userid,
- stu_torgcode
- }
+ // const usercode = getCookie('navTabId')
+ // const username = getCookie('admin')
+ // const usertype = getCookie('usertype')
+ // const userid = getCookie('userid')
+ // const stu_torgcode = getCookie('stu_torgcode')
+ // const data = {
+ // usercode,
+ // username,
+ // usertype,
+ // userid,
+ // stu_torgcode
+ // }
- logout(data).then(res => {
+ logout().then(res => {
if (res.code === '200') {
removeToken() // must remove token first
resetRouter()
- removeCookie('ruleCode')
- removeCookie('username')
- removeCookie('admin')
- removeCookie('navTabId')
- removeCookie('usertype')
- removeCookie('userid')
- removeCookie('rediskey')
- removeCookie('code')
- removeCookie('stu_torgcode')
- removeCookie('stu_torgname')
- removeCookie('description')
+ localStorage.removeItem('torg_code')
+ localStorage.removeItem('ButtonData')
+ localStorage.removeItem('usercode')
+ localStorage.removeItem('username')
+ localStorage.removeItem('torg')
+ localStorage.removeItem('token')
+ localStorage.removeItem('torg_name')
- removeCookie('guid')
+ // removeCookie('ruleCode')
+ // removeCookie('username')
+ // removeCookie('usercode')
+ // removeCookie('stu_torgname')
+ // removeCookie('code')
// reset visited views and cached views
dispatch('tagsView/delAllViews', null, { root: true })
+
sessionStorage.removeItem('tabViews')
- if (getCookie('cloud')) {
- removeCookie('cloud')
- window.location.href = 'http://182.61.13.206/choose'
- }
commit('RESET_STATE')
resolve()
--
Gitblit v1.9.3