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 |   66 ++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 1c71550..0e28ca3 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -1,6 +1,5 @@
 import React, {Component} from 'react'
-import { ConfigProvider } from 'antd'
-import zhCN from 'antd/es/locale/zh_CN'
+import { withRouter } from 'react-router-dom'
 
 import asyncComponent from '@/utils/asyncComponent'
 import Header from './header'
@@ -10,26 +9,42 @@
 // import './index.scss'
 
 const Tabview = asyncComponent(() => import('@/components/tabview'))
+const ImgScale = asyncComponent(() => import('@/components/imgScale'))
 
-class Design extends Component {
+class MkHS extends Component {
   UNSAFE_componentWillMount() {
-    sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
-    sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
-    sessionStorage.setItem('User_Name', sessionStorage.getItem('CloudUserName'))
-    sessionStorage.setItem('Full_Name', sessionStorage.getItem('CloudFullName'))
-
-    document.body.className = 'mk-blue-black'
-    window.GLOB.dataFormat = false // 鍘婚櫎姘村嵃
-    window.GLOB.mkHS = true
-
-    // HS涓嬩笉鍙紑鍚柇鐐硅皟璇�
-    window.GLOB.breakpoint = false
-    sessionStorage.removeItem('breakpoint')
-
-    Object.defineProperty(window, 'debugger', {
-      writable: false,
-      value: false
-    })
+    if (!sessionStorage.getItem('UserID')) {
+      this.props.history.replace('/login')
+    } else {
+      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'))
+      sessionStorage.setItem('Full_Name', sessionStorage.getItem('CloudFullName'))
+      sessionStorage.setItem('UserID', sessionStorage.getItem('CloudUserID'))
+      sessionStorage.setItem('LoginUID', sessionStorage.getItem('CloudLoginUID'))
+  
+      document.body.className = 'mk-blue-black'
+      window.GLOB.dataFormat = false // 鍘婚櫎姘村嵃
+      window.GLOB.mkHS = true
+  
+      // HS涓嬩笉鍙紑鍚柇鐐硅皟璇�
+      window.GLOB.breakpoint = false
+      sessionStorage.removeItem('breakpoint')
+  
+      Object.defineProperty(window, 'debugger', {
+        configurable: true,
+        enumerable: true,
+        set(value) {
+          if (value === 1949) {
+            window.GLOB.debugger = true
+          }
+        }
+      })
+    }
   }
 
   componentDidMount () {
@@ -47,14 +62,13 @@
   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>
     )
   }
 }
 
-export default Design
\ No newline at end of file
+export default withRouter(MkHS)
\ No newline at end of file

--
Gitblit v1.8.0