From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 08 五月 2025 16:30:39 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/systemfunc/index.jsx | 71 ++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx index b52f35d..bf2d296 100644 --- a/src/views/systemfunc/index.jsx +++ b/src/views/systemfunc/index.jsx @@ -1,34 +1,75 @@ import React, {Component} from 'react' -import { ConfigProvider } from 'antd' -import enUS from 'antd/es/locale/en_US' -import zhCN from 'antd/es/locale/zh_CN' +import { withRouter } from 'react-router-dom' import asyncComponent from '@/utils/asyncComponent' import Header from './header' +import MKEmitter from '@/utils/events.js' import Sidemenu from './sidemenu' -import './index.scss' +// import './index.scss' const Tabview = asyncComponent(() => import('@/components/tabview')) -const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS +const ImgScale = asyncComponent(() => import('@/components/imgScale')) -class Design extends Component { +class MkHS extends Component { UNSAFE_componentWillMount() { - sessionStorage.setItem('isEditState', 'true') - window.GLOB.mkHS = true + 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 + window.GLOB.dict = {} + + // 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 () { + MKEmitter.addListener('resetSelectLine', this.resetParentParam) + } + + componentWillUnmount () { + MKEmitter.removeListener('resetSelectLine', this.resetParentParam) + } + + resetParentParam = (MenuID, id, data) => { + window.GLOB.CacheData.set(MenuID, {...data, $BID: id}) } render () { return ( - <div className="mk-hs-view"> - <ConfigProvider locale={_locale}> - <Sidemenu key="sidemenu"/> - <Tabview key="tabview"/> - <Header key="header"/> - </ConfigProvider> + <div className="mk-main-view"> + <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