From 174e0fe2f15ef93fc58229d91c5a37ca7da8e1fa Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 09 May 2025 13:46:24 +0800
Subject: [PATCH] Merge branch 'test' into jiangwu
---
src/main.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main.js b/src/main.js
index 8a010d5..54eca1c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,9 +4,9 @@
* @LastEditors: shuishen 1109946754@qq.com
* @LastEditTime: 2025-04-10 12:19:47
* @FilePath: \drone-web-manage\src\main.js
- * @Description:
- *
- * Copyright (c) 2025 by shuishen, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2025 by shuishen, All Rights Reserved.
*/
import { createApp } from 'vue'
import website from './config/website'
@@ -39,7 +39,6 @@
import 'styles/common.scss'
// 业务组件
import tenantPackage from './views/system/tenantpackage.vue'
-
// 地图依赖
import mapContainer from './components/map-container/mapContainer.vue'
@@ -58,6 +57,7 @@
// 设置用户信息,把大屏用户信息保存到localStorage
let obj = {}
obj = localStorage.getItem("bs_userInfo")
+ obj = obj ? obj : localStorage.getItem("saber-userInfo")
if (obj instanceof Object) {
obj = obj.content
} else {
--
Gitblit v1.9.3