From 3d73201f0830320c703cfb3d36b47976eb3d94e7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:34:21 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/store/modules/user.js | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7f65049..8bc6bd3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo, LoginMenu } from '@/api/user'
+import { login, logout, getInfo, LoginMenu, LoginMenuCloud } from '@/api/user'
import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
@@ -35,14 +35,24 @@
login({ commit }, userInfo) {
const { username, password } = userInfo
return new Promise((resolve, reject) => {
- login({ username: username.trim(), password: password }).then(response => {
- // login({ UserName: '001', PassWord: 123, HOrgName: 1 }).then(response => {
- const { data: res } = response
-
- setCookie('admin', res.username)
- setCookie('navTabId', res.usercode)
- setCookie('usertype', res.usertype)
- setCookie('userid', res.userid)
+ login({ username: username.trim(), password: password, usertype: 'PC' }).then(res => {
+ console.log('PC绔櫥褰曟帴鍙�')
+ console.log(res)
+ // 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)
+ // }
+ // 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)
@@ -77,15 +87,28 @@
// get user menu
getMenu({ commit, state }) {
return new Promise((resolve, reject) => {
- LoginMenu().then(res => {
- if (res.code === '200') {
- commit('SET_NAME', res.Message)
- commit('SET_MENU', res.data)
- resolve(res.data)
- }
- }).catch(error => {
- reject(error)
- })
+ 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 {
+ LoginMenu({ usertype: 'PC', usercode: getCookie('admin') }).then(res => {
+ if (res.code === '200') {
+ commit('SET_NAME', res.Message)
+ commit('SET_MENU', res.data)
+ resolve(res.data)
+ }
+ }).catch(error => {
+ reject(error)
+ })
+ }
})
},
@@ -108,15 +131,24 @@
removeToken() // must remove token first
resetRouter()
+ removeCookie('ruleCode')
+ removeCookie('username')
removeCookie('admin')
removeCookie('navTabId')
removeCookie('usertype')
removeCookie('userid')
+ removeCookie('rediskey')
+ removeCookie('code')
+
+ removeCookie('guid')
// 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