From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/components/header/index.jsx | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index d4af1b3..80a849c 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -31,7 +31,8 @@
searchkey: '',
thdMenuList: [],
debug: sessionStorage.getItem('debug') === 'true' && window.GLOB.memberLevel > 0,
- collapse: sessionStorage.getItem('collapse') === 'true'
+ collapse: sessionStorage.getItem('collapse') === 'true',
+ lang: sessionStorage.getItem('lang') || ''
}
UNSAFE_componentWillMount () {
@@ -230,7 +231,13 @@
getwork = () => {
if (sessionStorage.getItem('work_grade')) return
- Api.genericInterface({func: 's_get_local_my_worker_v1'}).then(result => {
+ let param = {func: 's_get_local_my_worker_v1'}
+
+ if (window.GLOB.forcedUpdate) {
+ param.s_version_up = 'true'
+ }
+
+ Api.genericInterface(param).then(result => {
sessionStorage.setItem('work_grade', result.work_grade || 0)
sessionStorage.setItem('work_group', result.work_group || '')
@@ -782,7 +789,7 @@
</Dropdown>
{/* 缂栬緫鐘舵�佺櫥褰� */}
<Modal
- title="鐧诲綍寮�鍙戞満"
+ title={<span>鐧诲綍寮�鍙戞満{this.state.lang === 'en-US' ? <span style={{color: 'red'}}>锛堣嫳鏂囷級</span> : ''}</span>}
visible={this.state.loginVisible}
onOk={this.loginSubmit}
width={'430px'}
--
Gitblit v1.8.0