From 5d9a3141d4b3677bf8155da16b435d2a8818793b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 23 十月 2026 17:44:08 +0800
Subject: [PATCH] feat(report): 引入 SuperDoc 在线编辑器实现报告审核功能 支持审核页面直接编辑报告 - 新增检测报告与检验报告切换功能,切换时自动保存当前编辑内容 - 检测时间从单日选择改为日期范围选择,兼容历史单日数据回显 - 标准模型新增标准要求值字段,复制模板时携带完整表单数据 - 产品委托单下载报告按钮增加可用性状态控制
---
src/store/modules/user.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 66ed920..b1e5df4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,6 +15,8 @@
id: '',
name: '',
nickName: '',
+ nameEn: '',
+ userName: '',
avatar: '',
roles: [],
permissions: []
@@ -24,10 +26,8 @@
login(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
- const code = userInfo.code
- const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ login(username, password).then(res => {
setToken(res.token)
this.token = res.token
useLockStore().unlockScreen()
@@ -55,6 +55,8 @@
this.id = user.userId
this.name = user.userName
this.nickName = user.nickName
+ this.nameEn = user.nameEn
+ this.userName = user.userName
this.avatar = avatar
cache.session.set('pwrChrtype', res.pwdChrtype)
/* 鍒濆瀵嗙爜鎻愮ず */
@@ -78,12 +80,18 @@
// 閫�鍑虹郴缁�
logOut() {
return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
- this.token = ''
- this.roles = []
- this.permissions = []
- removeToken()
- resolve()
+ logout(this.token).then((res) => {
+ // 涓氬姟瀹氬埗锛氬悗绔繑鍥炶烦杞湴鍧�鏃惰蛋缁熶竴璁よ瘉鐧诲嚭锛堝 SSO 鍗曠偣閫�鍑猴級锛�
+ // 杩斿洖绌哄垯鎸夊父瑙勫墠绔櫥鍑哄鐞�
+ if (res.data) {
+ window.location.href = res.data
+ } else {
+ this.token = ''
+ this.roles = []
+ this.permissions = []
+ removeToken()
+ resolve()
+ }
}).catch(error => {
reject(error)
})
--
Gitblit v1.9.3