lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训

Browse Source
This commit is contained in:
夏菊
2025-02-25 16:46:09 +08:00
parent 9a1dae2f31
commit 1c5146a776
40 changed files with 1 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs
-9
View File
@@ -1,16 +1,7 @@
using System;
<<<<<<< HEAD
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Xml.Linq;
=======
using System.Data;
using System.Linq;
using System.Text;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs
-4
View File
@@ -4,10 +4,6 @@ using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
<<<<<<< HEAD
using System.Xml.Linq;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs
-5
View File
@@ -6,11 +6,6 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Web;
<<<<<<< HEAD
using System.Web.UI;
using System.Web.UI.WebControls;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs
-9
View File
@@ -1,16 +1,7 @@
using System;
<<<<<<< HEAD
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Xml.Linq;
=======
using System.Data;
using System.Linq;
using System.Text;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs
-9
View File
@@ -1,16 +1,7 @@
using System;
<<<<<<< HEAD
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Xml.Linq;
=======
using System.Data;
using System.Linq;
using System.Text;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx
-4
View File
@@ -61,11 +61,7 @@
</f:Toolbar>
</Toolbars>
<Columns>
<<<<<<< HEAD
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
=======
<f:TemplateField ColumnID="tfNumber" Width="60px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs
-8
View File
@@ -4,10 +4,6 @@ using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
<<<<<<< HEAD
using System.Xml.Linq;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
@@ -103,11 +99,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
}
if (this.drpRole.SelectedValue != BLL.Const._Null)
{
<<<<<<< HEAD
strSql += " AND Course.RoleId = @RoleId";
=======
strSql += " AND Standard.RoleId = @RoleId";
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue));
}
if (this.drpCategory.SelectedValue != BLL.Const._Null)
SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs
-5
View File
@@ -6,11 +6,6 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Web;
<<<<<<< HEAD
using System.Web.UI;
using System.Web.UI.WebControls;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs
-10
View File
@@ -1,11 +1,5 @@
using BLL;
<<<<<<< HEAD
using Microsoft.Office.Interop.Excel;
using System;
using System.Web;
=======
using System;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
@@ -167,11 +161,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
//newModel.RoleId = this.drpRole.SelectedValue;
newModel.CourseId = this.drpCourse.SelectedValue;
newModel.ClassHour = decimal.Parse(this.txtClassHour.Text.Trim());
<<<<<<< HEAD
newModel.Cycle = int.Parse(this.txtCycle.Text.Trim());
=======
newModel.Cycle = decimal.Parse(this.txtCycle.Text.Trim());
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
newModel.Method = this.drpMethod.SelectedText;
newModel.Outcome = this.drpOutcome.SelectedText;
newModel.Teachers = this.drpTeachers.SelectedText;
SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs
-9
View File
@@ -1,16 +1,7 @@
using System;
<<<<<<< HEAD
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Xml.Linq;
=======
using System.Data;
using System.Linq;
using System.Text;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using BLL;
using AspNet = System.Web.UI.WebControls;
SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{