Commit 13338f68 authored by 杨思琦's avatar 杨思琦

fix: 消息通知修改

parent 9d6bdf4b
Pipeline #80106 passed with stages
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
"@wisdom-map/arcgismap": "1.4.0-207", "@wisdom-map/arcgismap": "1.4.0-207",
"@wisdom-map/basemap": "1.1.0-31", "@wisdom-map/basemap": "1.1.0-31",
"@wisdom-map/util": "^1.0.28-0", "@wisdom-map/util": "^1.0.28-0",
"@wisdom-utils/components": "0.1.329", "@wisdom-utils/components": "0.1.330",
"@wisdom-utils/runtime": "0.0.48", "@wisdom-utils/runtime": "0.0.48",
"@wisdom-utils/utils": "0.1.369", "@wisdom-utils/utils": "0.1.370",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"antd": "4.21.2", "antd": "4.21.2",
"compression": "1.7.4", "compression": "1.7.4",
......
...@@ -671,6 +671,8 @@ const Layout = props => { ...@@ -671,6 +671,8 @@ const Layout = props => {
navTheme={props.global?.variableTheme?.navTheme ?? 'dark'} navTheme={props.global?.variableTheme?.navTheme ?? 'dark'}
homepage={props.global?.homepage ?? ''} homepage={props.global?.homepage ?? ''}
redirect={props.global?.redirect ?? ''} redirect={props.global?.redirect ?? ''}
openAnnouncement={props.global?.openAnnouncement ?? ''}
announcementContent={props.global?.announcementContent ?? ''}
mode="MDI" mode="MDI"
fixedHeader fixedHeader
headerHeight={52} headerHeight={52}
......
...@@ -408,6 +408,8 @@ class Login { ...@@ -408,6 +408,8 @@ class Login {
config.afterSales && typeof config.afterSales === 'string' config.afterSales && typeof config.afterSales === 'string'
? config.afterSales.split(',').includes(`${self.globalConfig?.userInfo?.OID}`) ? config.afterSales.split(',').includes(`${self.globalConfig?.userInfo?.OID}`)
: false; : false;
const openAnnouncement = config.OpenAnnouncement;
const announcementContent = config.AnnouncementContent;
self.globalConfig = Object.assign(self.globalConfig, config, { self.globalConfig = Object.assign(self.globalConfig, config, {
theme: self.globalConfig.theme, theme: self.globalConfig.theme,
menu: self.globalConfig.menu, menu: self.globalConfig.menu,
...@@ -415,6 +417,8 @@ class Login { ...@@ -415,6 +417,8 @@ class Login {
homepage: homepage || '', homepage: homepage || '',
products: self.globalConfig.products, products: self.globalConfig.products,
hideFeedback, hideFeedback,
openAnnouncement,
announcementContent,
// mapsettings: config.mapsettings // mapsettings: config.mapsettings
}); });
...@@ -429,6 +433,8 @@ class Login { ...@@ -429,6 +433,8 @@ class Login {
homepage: homepage || '', homepage: homepage || '',
products: self.globalConfig.products, products: self.globalConfig.products,
hideFeedback, hideFeedback,
openAnnouncement,
announcementContent,
}); });
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment