Commit 2a46ded0 authored by 杨思琦's avatar 杨思琦

fix: 菜单修改

parent b782ee8f
Pipeline #79740 passed with stages
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
"@wisdom-map/arcgismap": "1.4.0-203", "@wisdom-map/arcgismap": "1.4.0-203",
"@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.327", "@wisdom-utils/components": "0.1.328",
"@wisdom-utils/runtime": "0.0.47", "@wisdom-utils/runtime": "0.0.47",
"@wisdom-utils/utils": "0.1.367", "@wisdom-utils/utils": "0.1.368",
"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",
......
/* eslint-disable no-underscore-dangle */
import 'kit_logger'; import 'kit_logger';
import { log, params } from '@wisdom-utils/utils/lib/helpers'; import { log, params } from '@wisdom-utils/utils/lib/helpers';
import { message } from 'antd'; import { message } from 'antd';
...@@ -221,7 +222,7 @@ class Login { ...@@ -221,7 +222,7 @@ class Login {
? this.globalConfig.userInfo.fullName ? this.globalConfig.userInfo.fullName
: '', : '',
}) })
.catch(error => { }); .catch(error => {});
} }
if (window.location.host === 'panda-water.com') { if (window.location.host === 'panda-water.com') {
...@@ -235,7 +236,7 @@ class Login { ...@@ -235,7 +236,7 @@ class Login {
? this.globalConfig.userInfo.fullName ? this.globalConfig.userInfo.fullName
: '', : '',
}) })
.catch(error => { }); .catch(error => {});
} }
} }
...@@ -324,9 +325,9 @@ class Login { ...@@ -324,9 +325,9 @@ class Login {
.then(results => { .then(results => {
const promise = results[0]; const promise = results[0];
const site = results[1]; const site = results[1];
if (site.status == 'fulfilled') { if (site.status === 'fulfilled') {
const respon = site.value; const respon = site.value;
if (respon.code == 0 && respon.data.length) { if (respon.code === 0 && respon.data.length) {
window._changeStation = respon.data[0].changeStation; window._changeStation = respon.data[0].changeStation;
} }
} }
...@@ -372,7 +373,8 @@ class Login { ...@@ -372,7 +373,8 @@ class Login {
mqttConfig.mqtt_mess.TcpPort = DEFAULT_TCP_PORT; mqttConfig.mqtt_mess.TcpPort = DEFAULT_TCP_PORT;
mqttConfig.mqtt_IsSSL = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort}`; mqttConfig.mqtt_IsSSL = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort}`;
} }
mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443' mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}:${
mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443'
}`; }`;
self.globalConfig = Object.assign(self.globalConfig, { self.globalConfig = Object.assign(self.globalConfig, {
...mqttConfig, ...mqttConfig,
...@@ -421,6 +423,12 @@ class Login { ...@@ -421,6 +423,12 @@ class Login {
widgets: config.widgets || [], widgets: config.widgets || [],
allWidgets: config.widgets || [], allWidgets: config.widgets || [],
uiwidgets: config.uiwidgets || [], uiwidgets: config.uiwidgets || [],
theme: self.globalConfig.theme,
menu: self.globalConfig.menu,
style: self.globalConfig.style,
homepage: homepage || '',
products: self.globalConfig.products,
hideFeedback,
}); });
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
...@@ -498,9 +506,6 @@ class Login { ...@@ -498,9 +506,6 @@ class Login {
// if (mainConf.productType) // if (mainConf.productType)
// self.globalConfig.productType = mainConf.productType; // self.globalConfig.productType = mainConf.productType;
} }
if (this.globalConfig?.isIntegration >= 1) {
self.updateConfig && self.updateConfig(self.globalConfig);
}
this.isOpenYanshi(self, getIndustry); this.isOpenYanshi(self, getIndustry);
}); });
} else { } else {
...@@ -595,7 +600,7 @@ class Login { ...@@ -595,7 +600,7 @@ class Login {
} }
let flag = false; let flag = false;
this.globalConfig.uiwidgets.forEach(item => { this.globalConfig.uiwidgets.forEach(item => {
if (item.label == '图层管理') { if (item.label === '图层管理') {
flag = true; flag = true;
} }
}); });
...@@ -741,7 +746,7 @@ class Login { ...@@ -741,7 +746,7 @@ class Login {
height: '400', height: '400',
}); });
const handleMessage = function (event) { const handleMessage = function(event) {
const { origin } = event; const { origin } = event;
// Logger.log('origin', event.origin); // Logger.log('origin', event.origin);
if (origin === 'https://login.dingtalk.com') { if (origin === 'https://login.dingtalk.com') {
......
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