From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/systemfunc/index.jsx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 109d291..0e28ca3 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -1,7 +1,5 @@
import React, {Component} from 'react'
-import { ConfigProvider } from 'antd'
import { withRouter } from 'react-router-dom'
-import zhCN from 'antd/es/locale/zh_CN'
import asyncComponent from '@/utils/asyncComponent'
import Header from './header'
@@ -11,14 +9,17 @@
// import './index.scss'
const Tabview = asyncComponent(() => import('@/components/tabview'))
+const ImgScale = asyncComponent(() => import('@/components/imgScale'))
class MkHS extends Component {
UNSAFE_componentWillMount() {
if (!sessionStorage.getItem('UserID')) {
this.props.history.replace('/login')
} else {
- sessionStorage.setItem('LocalUserID', sessionStorage.getItem('UserID'))
- sessionStorage.setItem('LocalLoginUID', sessionStorage.getItem('LoginUID'))
+ if (!sessionStorage.getItem('LocalUserID')) {
+ sessionStorage.setItem('LocalUserID', sessionStorage.getItem('UserID'))
+ sessionStorage.setItem('LocalLoginUID', sessionStorage.getItem('LoginUID'))
+ }
sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
sessionStorage.setItem('User_Name', sessionStorage.getItem('CloudUserName'))
@@ -35,8 +36,13 @@
sessionStorage.removeItem('breakpoint')
Object.defineProperty(window, 'debugger', {
- writable: false,
- value: false
+ configurable: true,
+ enumerable: true,
+ set(value) {
+ if (value === 1949) {
+ window.GLOB.debugger = true
+ }
+ }
})
}
}
@@ -56,11 +62,10 @@
render () {
return (
<div className="mk-main-view">
- <ConfigProvider locale={zhCN}>
- <Sidemenu key="sidemenu"/>
- <Tabview key="tabview"/>
- <Header key="header"/>
- </ConfigProvider>
+ <Sidemenu key="sidemenu"/>
+ <Tabview key="tabview"/>
+ <Header key="header"/>
+ <ImgScale />
</div>
)
}
--
Gitblit v1.8.0