From 846933e9e7ed15061d81679f70758af99e81ccf4 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Mon, 12 May 2025 18:16:44 +0800
Subject: [PATCH] 1

---
 .../WorkPostTestTrainingItemIn.aspx.cs         | 18 +++++++++---------
 SUBQHSE/FineUIPro.Web/index.aspx               | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/WorkPostTestTrainingItemIn.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/WorkPostTestTrainingItemIn.aspx.cs
index 1cd8e14..cd03398 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/WorkPostTestTrainingItemIn.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/WorkPostTestTrainingItemIn.aspx.cs
@@ -310,10 +310,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     }
                     else
                     {
-                        var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
-                                                            && x.TrainingId == newViewTrainingItem.TrainingId);
-                        if (addTrainingItem == null)
-                        {
+                        // var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
+                        //                                     && x.TrainingId == newViewTrainingItem.TrainingId);
+                        // if (addTrainingItem == null)
+                        // {
                             Model.Training_TestTrainingItem newTrainingItem = new Model.Training_TestTrainingItem
                             {
                                 TrainingItemId = newViewTrainingItem.TrainingItemId = SQLHelper.GetNewID(typeof(Model.Training_TestTraining)),
@@ -347,11 +347,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                             BLL.TestTrainingItemService.AddTestTrainingItem(newTrainingItem);
                             ///加入培训试题库
                             viewTrainingItems.Add(newViewTrainingItem);
-                        }
-                        else
-                        {
-                            result += "第" + (i + 2).ToString() + "行," + "导入试题重复" + "|";
-                        }
+                        // }
+                        // else
+                        // {
+                        //     result += "第" + (i + 2).ToString() + "行," + "导入试题重复" + "|";
+                        // }
                     }
                 }
                 if (viewTrainingItems.Count > 0)
diff --git a/SUBQHSE/FineUIPro.Web/index.aspx b/SUBQHSE/FineUIPro.Web/index.aspx
index 95040e9..aefaef3 100644
--- a/SUBQHSE/FineUIPro.Web/index.aspx
+++ b/SUBQHSE/FineUIPro.Web/index.aspx
@@ -66,7 +66,7 @@
             background-color: transparent !important;
             padding: 0 !important;
             line-height: 1;
-                    color: #ffffff;
+                    color: #ffffff !important;
         }
 
         .activeClick {
@@ -83,10 +83,10 @@
                     color: #ffffff;
         }
 
-        .f-state-default, .f-widget-content .f-state-default, .f-widget-header .f-state-default {
+        .bgbtn3  {
             background-image: none;
-            background-color: transparent;
-            color: #ffffff;
+            background-color: transparent !important;
+            color: #ffffff ;
         }
         .header .layui-nav {
             padding: 0;
@@ -147,6 +147,8 @@
             line-height: 1;
             font-size: 14px;
             border: none;
+            background-color: transparent !important;
+            color: #ffffff !important;
         }
               .bgbtn3{
        position:absolute;
@@ -262,21 +264,21 @@
                 </div>
             </div>
             <div class="set">
-                <div class="iconfont icon-nav07">
+                <div class="iconfont icon-nav07" style="color: #FFFFFF;">
                     <a href="javascript:void(0);" style="color:#ffffff;" onclick="onToolSignOutClick()">退出</a>
                 </div>
-                <div class="iconfont icon-nav06">
+                <div class="iconfont icon-nav06" style="color: #FFFFFF;">
                     <f:Button runat="server" CssClass="bgbtn2" OnClick="btnSysSet_Click" Text="设置"
                         EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
                     </f:Button>
                 </div>
 
-                <div class="iconfont icon-nav05" >
+                <div class="iconfont icon-nav05" style="color: #FFFFFF;">
                      <f:Button runat="server" CssClass="bgbtn2" OnClick="btnPersonal_Click"
      EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="userName" OnClientClick="parent.removeActiveTab();">
  </f:Button>
                 </div>
-                 <div class="iconfont icon-nav08" @click="full">全屏</div>
+                 <div class="iconfont icon-nav08" style="color: #FFFFFF;" @click="full">全屏</div>
                   <div style="opacity:0;">
                       <f:Button runat="server" CssClass="bgbtntop" Text="刷新" ToolTip="刷新菜单" IconFont="Retweet" OnClick="btnRetweet_Click"
                           EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">