diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx b/SUBQHSE/FineUIPro.Web/indexProject.aspx index 9820e93..a10b1e5 100644 --- a/SUBQHSE/FineUIPro.Web/indexProject.aspx +++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx @@ -445,6 +445,29 @@ border: none; } + /* 首页标签文字显色 + 修复common.css重置导致的样式丢失 */ + .f-tabstrip-header .f-tab-header { + color: #1ab1ff !important; + padding: 5px 10px !important; + line-height: normal !important; + } + .f-tabstrip-header .f-tab-header.f-state-active { + color: #ffffff !important; + background-color: #0B2A56 !important; + } + .f-tabstrip-header .f-tab-header.f-state-active .f-icon { + color: #ffffff !important; + } + .f-tabstrip-header .f-tab-header .f-icon { + color: #1ab1ff !important; + } + .f-tabstrip-header .f-tab-header-text { + line-height: normal !important; + } + .f-tabstrip-header-clip { + line-height: normal !important; + } + .f-panel > .f-panel-bodyct { background: #001B35; } @@ -1058,6 +1081,16 @@ } $this.addClass('activeClick') } + // 显示mainTabStrip的头部 + var $tabHeader = $('.f-tabstrip-header'); + $tabHeader.attr('style', ';display:block !important;'); + }); + + // 点击首页/Logo区域时隐藏mainTabStrip的头部 + $(".bgbtn3").click(function () { + var $tabHeader = $('.f-tabstrip-header'); + $tabHeader.attr('style', ';display:none !important;'); + $(".bgbtn,.bgbtntop").removeClass("activeClick"); }); var mainTabStrip = F(mainTabStripClientID); var leftPanel = F(leftPanelClientID); @@ -1142,6 +1175,11 @@ methods: { onSwitchMenu(idx) { this.navIdx = idx; + // 显示mainTabStrip的头部 + var $tabHeader = $('.f-tabstrip-header'); + if ($tabHeader.length) { + $tabHeader.attr('style', ';display:block !important;'); + } }, onRefresh() { alert("刷新"); diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs index 5927cb2..677bea5 100644 --- a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs @@ -620,6 +620,8 @@ namespace FineUIPro.Web this.leftPanel.Hidden = true; this.Tab1.IFrameUrl = "~/common/mainProject.aspx"; this.CurrUser.LastProjectId = null; + this.mainTabStrip.ShowTabHeader = false; + if (!string.IsNullOrEmpty(type)) { this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; @@ -628,18 +630,25 @@ namespace FineUIPro.Web this.XmlDataSource1.DataFile = "common/" + type + ".xml"; this.leftPanel.Hidden = false; this.Tab1.IFrameUrl = "~/common/main" + type + ".aspx"; + this.mainTabStrip.ShowTabHeader = true; + if (type == Const.Menu_Personal) { //this.Tab1.IFrameUrl = "~/Personal/PersonalInfo.aspx"; this.Tab1.IFrameUrl = "~/Workflow/WorkflowTodo.aspx"; + } else if (type == Const.Menu_ProjectSet) { this.Tab1.IFrameUrl = "~/ProjectData/ProjectSetView.aspx"; + + } else if (type == Const.Menu_ToDo) { this.Tab1.IFrameUrl = "~/common/todolist.aspx"; + + } else if (type == Const.Menu_PThreeYearAction) {