Merge branch 'gn_optimize' into debug

src/utils/loginTransfer.js

@@ -21,7 +21,7 @@ export function setLoginCookieInfo(data) {
   localStorage.setItem("AdminId", AdminId);
   localStorage.setItem("AdminName", AdminName);
   localStorage.setItem("loginTime",new Date())
-  storage.setCookie('ai_user',AdminName)
+  // storage.setCookie('ai_user',AdminName)
 
   if(['/login','/fogetpassword'].includes(location.pathname)) {
     router.replace({path:'/home'})

src/views/Home.vue

@@ -363,24 +363,24 @@
               </div>
               <!-- 消息通知 -->
               <notification-msg ref="notification" />
-              <el-dropdown trigger="click" style="width: 130px">
+              <el-dropdown trigger="click" style="width: 130px;margin-left:10px" disabled>
                 <span class="el-dropdown-link userinfo-inner">
                   <img src="~@/assets/img/home/avatar.png" />
                   {{ sysUserName }}
-                  <i class="el-icon-arrow-down el-icon--right" />
+                  <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
                 </span>
-                <el-dropdown-menu slot="dropdown">
+                <!-- <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item divided @click.native="resetpwd"
-                    ><!-- 修改密码 -->{{
+                    >{{
                       $t("MainPage.tab_reset_pwd")
                     }}</el-dropdown-item
                   >
                   <el-dropdown-item divided @click.native="logout"
-                    ><!-- 退出登录 -->{{
+                    >{{
                       $t("MainPage.tab_log_out")
                     }}</el-dropdown-item
                   >
-                </el-dropdown-menu>
+                </el-dropdown-menu> -->
               </el-dropdown>
             </div>
           </div>
@@ -627,7 +627,8 @@ export default {
     
     // 跳转数据节点
     handleGoSJJD(){
-      window.open('https://www.baidu.com', '_blank')
+      let path = `${location.origin}/space/`
+      window.open(path, '_blank')
     },
 
     handleClickSubMenuItem(item, e) {
@@ -952,7 +953,7 @@ export default {
           localStorage.setItem("ManageType", "");
           localStorage.setItem("RoleIdentity", "");
           localStorage.setItem("loginTime", "");
-          storage.setCookie('ai_user','',-1)
+          // storage.setCookie('ai_user','',-1)
         }, 10);
 
       }).catch(() => { });

src/views/dataEntry_manage/css/chartfit.scss

@@ -56,6 +56,7 @@ $font-normal:14px;
 			}
 			.tree-cont {
 				padding: 15px 20px 30px;
+				margin-right: 20px;
 				overflow: auto;
 				max-height: calc(100vh - 330px);
 			}