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/Examine/BehavioralSafetyObservation.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs
-9
View File
@@ -1,17 +1,8 @@
using BLL;
using System;
using System.Collections.Generic;
<<<<<<< HEAD
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
=======
using System.Data;
using System.Linq;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs
-11
View File
@@ -1,19 +1,8 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
=======
using System.Data;
using System.Linq;
using System.Text;
using BLL;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Examine
SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs
-13
View File
@@ -1,16 +1,4 @@
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 BLL;
using static System.Runtime.CompilerServices.RuntimeHelpers;
using AspNet = System.Web.UI.WebControls;
=======
using System.Data;
using System.Linq;
using System.Text;
@@ -18,7 +6,6 @@ using BLL;
using AspNet = System.Web.UI.WebControls;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
public partial class SharingOfSafetyExperience : PageBase
SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs
-4
View File
@@ -1,9 +1,5 @@
using BLL;
using System;
<<<<<<< HEAD
using System.Web;
=======
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs
-12
View File
@@ -1,19 +1,7 @@
using BLL;
<<<<<<< HEAD
using FineUIPro.Web.HSSE.SitePerson;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
=======
using System;
using System.Data;
using System.Linq;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{