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/main/index.jsx | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/views/main/index.jsx b/src/views/main/index.jsx
index 8723ebc..2686a48 100644
--- a/src/views/main/index.jsx
+++ b/src/views/main/index.jsx
@@ -1,4 +1,4 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
import asyncComponent from '@/utils/asyncComponent'
import Header from '@/components/header'
@@ -11,6 +11,7 @@
const Tabview = asyncComponent(() => import('@/components/tabview'))
const Breadview = asyncComponent(() => import('@/components/breadview'))
+const SysMessage = asyncComponent(() => import('@/components/header/sysmessage/index'))
class Main extends Component {
state = {
@@ -31,10 +32,22 @@
configurable: true,
enumerable: true,
set(value) {
- if (value + '' === 'false') {
- window.GLOB.debugger = false
- } else {
+ if (value === true) {
window.GLOB.debugger = true
+ } else if (value === 0) {
+ if (window.backend) {
+ sessionStorage.setItem('systemRun', 'front')
+ window.location.reload()
+ } else {
+ window.mkInfo('绯荤粺褰撳墠鏈娇鐢ㄥ悗绔剼鏈紒')
+ }
+ } else if (value === false) {
+ if (sessionStorage.getItem('systemRun') === 'front') {
+ sessionStorage.removeItem('systemRun')
+ window.location.reload()
+ } else {
+ window.GLOB.debugger = false
+ }
}
}
})
@@ -55,6 +68,17 @@
MKEmitter.emit('debugChange')
}
})
+ } else {
+ Object.defineProperty(window, 'debugger', {
+ configurable: true,
+ enumerable: true,
+ set(value) {
+ if (value === 1949) {
+ sessionStorage.setItem('cloudRun', 'debug')
+ window.location.reload()
+ }
+ }
+ })
}
}
@@ -72,15 +96,18 @@
if (!this.state.userId) return null
return (
- <div className="mk-main-view">
- <Header key="header"/>
- {navBar === 'shutter' ? <Sidemenu key="sidemenu"/> : null}
- {navBar === 'shutter' || navBar === 'menu_board_navigation' ?
- <Tabview key="tabview"/> :
- <Breadview key="breadview"/>}
+ <>
+ <div className="mk-main-view">
+ <Header key="header"/>
+ {navBar === 'shutter' ? <Sidemenu key="sidemenu"/> : null}
+ {navBar === 'shutter' || navBar === 'menu_board_navigation' ?
+ <Tabview key="tabview"/> :
+ <Breadview key="breadview"/>}
+ <ImgScale />
+ </div>
{window.GLOB.systemType === 'production' ? <QueryLog /> : null}
- <ImgScale />
- </div>
+ {window.GLOB.SysNotice ? <SysMessage /> : null}
+ </>
)
}
}
--
Gitblit v1.8.0