diff --git a/ljwx-bigscreen/bigscreen/bigScreen/templates/bigscreen_main.html b/ljwx-bigscreen/bigscreen/bigScreen/templates/bigscreen_main.html index 9e7cbb1..e30ce68 100644 --- a/ljwx-bigscreen/bigscreen/bigScreen/templates/bigscreen_main.html +++ b/ljwx-bigscreen/bigscreen/bigScreen/templates/bigscreen_main.html @@ -2608,7 +2608,10 @@ // 🗺️ 地图初始化 - 修复地图未初始化问题 console.log('🗺️ 开始初始化地图...'); try { - initializeMap('{{ customerId }}', '-1'); + // 从URL获取userId参数,如果没有则不传递 + const urlParams = new URLSearchParams(window.location.search); + const userId = urlParams.get('userId') || null; + initializeMap('{{ customerId }}', userId); console.log('✅ 地图初始化完成'); } catch (error) { console.error('❌ 地图初始化失败:', error); @@ -3055,12 +3058,15 @@ //console.log('initializeMap.userId',userId); //console.log('initializeMap.severityLevel',`./generateAlertJson?customerId=${deptId}&userId=${userId}&severityLevel=critical`); - // v1.0.32 - 添加medium级别告警点支持 + // v1.0.32 - 添加medium级别告警点支持,优化URL构建逻辑 + const baseParams = `customerId=${deptId}`; + const userParam = (userId && userId !== '-1' && userId !== 'all') ? `&userId=${userId}` : ''; + const dataUrls = { - critical: `./generateAlertJson?customerId=${deptId}&userId=${userId}&severityLevel=critical`, - high: `./generateAlertJson?customerId=${deptId}&userId=${userId}&severityLevel=high`, - medium: `./generateAlertJson?customerId=${deptId}&userId=${userId}&severityLevel=medium`, // 新增medium级别 - health: `./generateHealthJson?customerId=${deptId}&userId=${userId}` + critical: `./generateAlertJson?${baseParams}${userParam}&severityLevel=critical`, + high: `./generateAlertJson?${baseParams}${userParam}&severityLevel=high`, + medium: `./generateAlertJson?${baseParams}${userParam}&severityLevel=medium`, + health: `./generateHealthJson?${baseParams}${userParam}` }; console.log('🔗 数据URL准备完成,等待地图加载'); @@ -4420,7 +4426,10 @@ document.addEventListener('DOMContentLoaded', () => { // 🗺️ 地图初始化 - 修复地图未初始化问题 console.log('🗺️ 开始初始化地图...'); try { - initializeMap('{{ customerId }}', '-1'); + // 从URL获取userId参数,如果没有则不传递 + const urlParams = new URLSearchParams(window.location.search); + const userId = urlParams.get('userId') || null; + initializeMap('{{ customerId }}', userId); console.log('✅ 地图初始化完成'); } catch (error) { console.error('❌ 地图初始化失败:', error); @@ -7040,7 +7049,9 @@ div.innerHTML=` // 重新初始化地图 const urlParams = new URLSearchParams(window.location.search); const customerId = urlParams.get('customerId') || '{{ customerId }}' || '1'; - initializeMap(customerId, '-1'); + // 从URL获取userId参数,如果没有则不传递 + const userId = urlParams.get('userId') || null; + initializeMap(customerId, userId); // 等待地图初始化完成再更新数据 setTimeout(() => {