Merge branch 'dev' of https://cloud.wodcloud.com/git/smart-operation/so-manage-ui into dev

src/App.vue

@@ -126,8 +126,6 @@ export default {
       this.readFlag = !this.readFlag;
     },
     initMsg() {
-      console.log(this.userInfo);
-      console.log(this.$trace);
       if (this.userInfo && this.userInfo.system_id) {
         this.$trace.setOptionValue("userId", this.userInfo.system_id);
         // this.$trace.setOptionValue('userType',this.userInfo.userType)

src/components/bg-menu.vue

@@ -73,7 +73,7 @@
       </div>
     </div>
 
-    <div class="person-menu" v-if="userInfo && userInfo.system_id">
+    <div class="person-menu">
       <!-- 用户中心 -->
       <div class="user-center nav-item">
         <span class="user-icon">
@@ -86,14 +86,14 @@
             style="width: 24px; height: 24px; border-radius: 50%; vertical-align: middle"
             src="../assets/imgs/home_ic_user.png" />
         </span>
-        <span v-if="userInfo && userInfo.system_id" class="user-name">
-          {{ userInfo.system_account || userInfo.system_id }}
+        <span v-if="userInfo" class="user-name">
+          {{ userInfo.system_account }}
 
           <bg-icon icon="#bg-ic-arrow-down" style="font-size: 8px; margin-left: 3px" />
         </span>
         <span v-else class="user-name"> 请登录 </span>
         <div class="menu-virtual"></div>
-        <div v-if="userInfo && userInfo.system_id" class="menu-list">
+        <div v-if="userInfo" class="menu-list">
           <div
             v-for="(item, index) in systemMenu"
             :key="index + 700"
@@ -179,14 +179,9 @@ export default {
         return temp;
       },
       systemMenu(state) {
-        const { is_admin } = state.userInfo;
         let temp = [];
         state.menu?.forEach((e) => {
           if (e.dict_group_id == "26d3903a-863e-4efc-b53e-0fb8772ddaa4") {
-            // 业务系统用户和组织管理员配置了后台管理，将其隐藏
-            if (is_admin < 3 && e.menuName === "管理中心") {
-              return;
-            }
             temp.push(e);
           }
         });

src/components/login-by-account.vue

@@ -153,7 +153,7 @@ const getUser = () => {
       store.commit("setMenuObj", menuObj);
       // }
       generateRoutes();
-      router.push("/");
+      router.push("/forewarning/list");
     }
   });
 };