This commit is contained in:
geh 2025-05-12 18:16:44 +08:00
parent 93b766c301
commit 846933e9e7
2 changed files with 19 additions and 17 deletions

View File

@ -310,10 +310,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
} }
else else
{ {
var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts // var addTrainingItem = Funs.DB.Training_TestTrainingItem.FirstOrDefault(x => x.Abstracts == newViewTrainingItem.Abstracts
&& x.TrainingId == newViewTrainingItem.TrainingId); // && x.TrainingId == newViewTrainingItem.TrainingId);
if (addTrainingItem == null) // if (addTrainingItem == null)
{ // {
Model.Training_TestTrainingItem newTrainingItem = new Model.Training_TestTrainingItem Model.Training_TestTrainingItem newTrainingItem = new Model.Training_TestTrainingItem
{ {
TrainingItemId = newViewTrainingItem.TrainingItemId = SQLHelper.GetNewID(typeof(Model.Training_TestTraining)), TrainingItemId = newViewTrainingItem.TrainingItemId = SQLHelper.GetNewID(typeof(Model.Training_TestTraining)),
@ -347,11 +347,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
BLL.TestTrainingItemService.AddTestTrainingItem(newTrainingItem); BLL.TestTrainingItemService.AddTestTrainingItem(newTrainingItem);
///加入培训试题库 ///加入培训试题库
viewTrainingItems.Add(newViewTrainingItem); viewTrainingItems.Add(newViewTrainingItem);
} // }
else // else
{ // {
result += "第" + (i + 2).ToString() + "行," + "导入试题重复" + "|"; // result += "第" + (i + 2).ToString() + "行," + "导入试题重复" + "|";
} // }
} }
} }
if (viewTrainingItems.Count > 0) if (viewTrainingItems.Count > 0)

View File

@ -66,7 +66,7 @@
background-color: transparent !important; background-color: transparent !important;
padding: 0 !important; padding: 0 !important;
line-height: 1; line-height: 1;
color: #ffffff; color: #ffffff !important;
} }
.activeClick { .activeClick {
@ -83,10 +83,10 @@
color: #ffffff; color: #ffffff;
} }
.f-state-default, .f-widget-content .f-state-default, .f-widget-header .f-state-default { .bgbtn3 {
background-image: none; background-image: none;
background-color: transparent; background-color: transparent !important;
color: #ffffff; color: #ffffff ;
} }
.header .layui-nav { .header .layui-nav {
padding: 0; padding: 0;
@ -147,6 +147,8 @@
line-height: 1; line-height: 1;
font-size: 14px; font-size: 14px;
border: none; border: none;
background-color: transparent !important;
color: #ffffff !important;
} }
.bgbtn3{ .bgbtn3{
position:absolute; position:absolute;
@ -262,21 +264,21 @@
</div> </div>
</div> </div>
<div class="set"> <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> <a href="javascript:void(0);" style="color:#ffffff;" onclick="onToolSignOutClick()">退出</a>
</div> </div>
<div class="iconfont icon-nav06"> <div class="iconfont icon-nav06" style="color: #FFFFFF;">
<f:Button runat="server" CssClass="bgbtn2" OnClick="btnSysSet_Click" Text="设置" <f:Button runat="server" CssClass="bgbtn2" OnClick="btnSysSet_Click" Text="设置"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
</f:Button> </f:Button>
</div> </div>
<div class="iconfont icon-nav05" > <div class="iconfont icon-nav05" style="color: #FFFFFF;">
<f:Button runat="server" CssClass="bgbtn2" OnClick="btnPersonal_Click" <f:Button runat="server" CssClass="bgbtn2" OnClick="btnPersonal_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="userName" OnClientClick="parent.removeActiveTab();"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="userName" OnClientClick="parent.removeActiveTab();">
</f:Button> </f:Button>
</div> </div>
<div class="iconfont icon-nav08" @click="full">全屏</div> <div class="iconfont icon-nav08" style="color: #FFFFFF;" @click="full">全屏</div>
<div style="opacity:0;"> <div style="opacity:0;">
<f:Button runat="server" CssClass="bgbtntop" Text="刷新" ToolTip="刷新菜单" IconFont="Retweet" OnClick="btnRetweet_Click" <f:Button runat="server" CssClass="bgbtntop" Text="刷新" ToolTip="刷新菜单" IconFont="Retweet" OnClick="btnRetweet_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">