Merge branch 'master' of http://47.104.102.122:3000/xiaju/SGGL_JT

SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj

@@ -12670,9 +12670,13 @@
     <Compile Include="ProjectData\LocationSelect.aspx.designer.cs">
       <DependentUpon>LocationSelect.aspx</DependentUpon>
     </Compile>
-    <Compile Include="ProjectData\MasterProjectData.aspx.cs" />
+    <Compile Include="ProjectData\MasterProjectData.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="ProjectData\MasterProjectData.aspx.designer.cs" />
-    <Compile Include="ProjectData\MasterProjectDataUsage.aspx.cs" />
+    <Compile Include="ProjectData\MasterProjectDataUsage.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="ProjectData\MasterProjectDataUsage.aspx.designer.cs" />
     <Compile Include="ProjectData\ProjectDevices.aspx.cs">
       <DependentUpon>ProjectDevices.aspx</DependentUpon>

SUBQHSE/FineUIPro.Web/Global.asax.cs

@@ -63,7 +63,7 @@
                 var sysSet7 = (from x in Funs.DB.Sys_Set where x.SetName == "是否启用实名制" select x).ToList().FirstOrDefault();
                 if (sysSet7 != null && sysSet7.IsAuto == true)
                 {
-                    // BLL.RealNameMonitorService.StartMonitor();
+                     BLL.RealNameMonitorService.StartMonitor();
                 }
             }
             catch (Exception ex)

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("刷新");

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)
                     {