Commit 274212ae authored by 杨思琦's avatar 杨思琦

新增样式

parent 5d26895c
Pipeline #85880 passed with stages
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
"@wisdom-map/arcgismap": "1.4.0-261", "@wisdom-map/arcgismap": "1.4.0-261",
"@wisdom-map/basemap": "1.1.0-41", "@wisdom-map/basemap": "1.1.0-41",
"@wisdom-map/util": "^1.0.28-0", "@wisdom-map/util": "^1.0.28-0",
"@wisdom-utils/components": "0.1.352", "@wisdom-utils/components": "0.1.353",
"@wisdom-utils/runtime": "0.0.48", "@wisdom-utils/runtime": "0.0.48",
"@wisdom-utils/utils": "0.1.388", "@wisdom-utils/utils": "0.1.393",
"@congcongcai/jieba.js" : "0.0.3", "@congcongcai/jieba.js" : "0.0.3",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"antd": "4.21.2", "antd": "4.21.2",
......
This diff was suppressed by a .gitattributes entry.
...@@ -737,6 +737,11 @@ const Layout = props => { ...@@ -737,6 +737,11 @@ const Layout = props => {
{dom} {dom}
</a> </a>
)} )}
menuSuffixRender={() => (
props.global?.variableTheme?.navTheme === 'chinaWater' ?
(<img src={require('../assets/basic/chinaWater.png')} style={{width: '100%'}} alt="" />)
: <></>
)}
> >
<Suspense fallback={<></>}> <Suspense fallback={<></>}>
{/* {window.location.pathname.startsWith('/civbase/civ_3d') ? ( */} {/* {window.location.pathname.startsWith('/civbase/civ_3d') ? ( */}
......
...@@ -610,11 +610,19 @@ class Login { ...@@ -610,11 +610,19 @@ class Login {
self.globalConfig.navTheme = mainConf.navTheme; // 云平台统一navTheme self.globalConfig.navTheme = mainConf.navTheme; // 云平台统一navTheme
// 云平台切换站点 应用站点自己主题配置 // 云平台切换站点 应用站点自己主题配置
if (config.CloudStyle === '否') { if (config.CloudStyle === '否') {
self.globalConfig.variableTheme = { if (config.navTheme === 'chinaWater') {
primaryColor: config.primaryColor, self.globalConfig.variableTheme = {
navTheme: config.navTheme, primaryColor: '#009C73',
headerPrimaryColor: config.headerPrimaryColor, navTheme: config.navTheme,
}; headerPrimaryColor: 'linear-gradient(0deg, #048373 0%, #24AE9D 100%)',
};
} else {
self.globalConfig.variableTheme = {
primaryColor: config.primaryColor,
navTheme: config.navTheme,
headerPrimaryColor: config.headerPrimaryColor,
};
}
} else { } else {
self.globalConfig.variableTheme = { self.globalConfig.variableTheme = {
primaryColor: mainConf.primaryColor, primaryColor: mainConf.primaryColor,
......
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