|
|
@@ -3,7 +3,7 @@
|
|
|
<% if(controller === 'boot' || controller === 'pm'){ %>
|
|
|
<!--<a style="text-decoration: none" href="javascript:void(0);" class="header-logo">-->
|
|
|
<% }else { %>
|
|
|
- <div class="mx-2"><a href="/pm" class="btn btn-sm" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
|
|
|
+ <div class="mx-2"><a href="/pm" class="btn btn-sm text-white" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
|
|
|
<!--<a style="text-decoration: none" href="/pm" class="header-logo">-->
|
|
|
<% } %>
|
|
|
<div class="header-logo">
|
|
|
@@ -18,7 +18,7 @@
|
|
|
<!--大屏菜单-->
|
|
|
<ul class="nav navbar-nav" id="fluid-menu">
|
|
|
<li class="nav-item dropdown">
|
|
|
- <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
|
|
|
+ <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
|
|
|
<div class="dropdown-menu dropdown-menu-right">
|
|
|
<a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
|
|
|
<a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
|
|
|
@@ -67,7 +67,7 @@
|
|
|
</a>
|
|
|
<div class="dropdown-menu dropdown-menu-right">
|
|
|
<div class="dropdown dropleft dropdown-submenu">
|
|
|
- <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
|
|
|
+ <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
|
|
|
<div class="dropdown-menu">
|
|
|
<a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
|
|
|
<a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
|
|
|
@@ -288,4 +288,4 @@
|
|
|
<script type="text/javascript" src="/public/web/headerOpr.js"></script>
|
|
|
<script type="text/javascript" src="/public/common_util.js"></script>
|
|
|
<script type="text/javascript" src="/lib/jquery-editable-select/jquery.editable-select.min.js"></script>
|
|
|
-<!-- endinject -->
|
|
|
+<!-- endinject -->
|
