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

数据库变更CNPC_XJYJ

Browse Source
This commit is contained in:
夏菊
2025-08-04 18:04:41 +08:00
parent bafbf97359
commit 79a7f35e22
679 changed files with 5590 additions and 3465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs
+1 -1
View File
@@ -1092,7 +1092,7 @@ namespace FineUIPro.Web.CQMS.Check
drpHandleMan.Items.Clear();
if (!string.IsNullOrEmpty(drpHandleType.SelectedText))
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
if (drpHandleType.SelectedText.Contains("总包"))
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty);
SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs
+1 -1
View File
@@ -343,7 +343,7 @@ namespace FineUIPro.Web.CQMS.ConstructionLog
{
workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
}
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var projects = from x in db.Base_Project select x;
var lists = from x in db.CQMS_ConstructionLogItem where x.ConstructionLogId == constructionLogId select x;
// 创建单元格样式
SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs
+8 -8
View File
@@ -1096,7 +1096,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1127,7 +1127,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1178,7 +1178,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1208,7 +1208,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1239,7 +1239,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1270,7 +1270,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1300,7 +1300,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trSeven.Nodes.Add(rootNode);
trSeven.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1330,7 +1330,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trEight.Nodes.Add(rootNode);
trEight.EnableCheckBox = true;
//using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
//using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
//{
// var userList = from x in db.Sys_User
// join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationView.aspx.cs
+8 -8
View File
@@ -284,7 +284,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -315,7 +315,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -366,7 +366,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -396,7 +396,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -427,7 +427,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -458,7 +458,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -488,7 +488,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trSeven.Nodes.Add(rootNode);
trSeven.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -518,7 +518,7 @@ namespace FineUIPro.Web.CQMS.Information
rootNode.EnableCheckEvent = true;
trEight.Nodes.Add(rootNode);
trEight.EnableCheckBox = true;
//using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
//using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
//{
// var userList = from x in db.Sys_User
// join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs
+6 -6
View File
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -201,7 +201,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -252,7 +252,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -313,7 +313,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -344,7 +344,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+7 -7
View File
@@ -1082,7 +1082,7 @@ namespace FineUIPro.Web.CQMS.Solution
private void initDropSameGroup(DropDownList drop , string type)
{
List<Sys_User> users = new List<Sys_User>();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
switch (type)
{
@@ -1177,7 +1177,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1208,7 +1208,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1259,7 +1259,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1289,7 +1289,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1320,7 +1320,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1351,7 +1351,7 @@ namespace FineUIPro.Web.CQMS.Solution
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs
+2 -2
View File
@@ -70,7 +70,7 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var cNProfessionals = from x in db.Base_CNProfessional select x;
var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
var divisionProjects = (from x in db.WBS_DivisionProject where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
@@ -519,7 +519,7 @@ namespace FineUIPro.Web.CQMS.WBS
ir = pds.Rows.Count;
if (pds != null && ir > 0)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var oldViewInfos = from x in db.WBS_BreakdownProject
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -301,6 +301,7 @@
<Content Include="common\mainMenu_CQMS_1.aspx" />
<Content Include="common\mainMenu_FiveStarts.aspx" />
<Content Include="common\mainMenu_HJGL2.aspx" />
<Content Include="common\mainMenu_Staff.aspx" />
<Content Include="common\mainMenu_HSSE2.aspx" />
<Content Include="common\mainMenu_SubPackManage.aspx" />
<Content Include="common\mainMenu_SYHSE.aspx" />
@@ -8023,6 +8024,13 @@
<Compile Include="common\mainMenu_HJGL2.aspx.designer.cs">
<DependentUpon>mainMenu_HJGL2.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_Staff.aspx.cs">
<DependentUpon>mainMenu_Staff.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainMenu_Staff.aspx.designer.cs">
<DependentUpon>mainMenu_Staff.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_HSSE2.aspx.cs">
<DependentUpon>mainMenu_HSSE2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/Global.asax.cs
+1 -1
View File
@@ -96,7 +96,7 @@
{
StringBuilder errLog = null;
Exception ex = null;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
Sys_ErrLogInfo newErr = new Sys_ErrLogInfo
{
SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegist.aspx.cs
+1 -1
View File
@@ -144,7 +144,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId);
//BLL.HJGL_EMaterialRegistService.DeleteEMaterialRegistItem(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, EMaterialRegistId);
BLL.HJGL_EMInventoryRecordsService.UpdateEMInventoryRecords(this.CurrUser.LoginProjectId, eMaterialRegist.Unit, eMaterialRegist.WMT_ID, "", "", -decimal.Parse(eMaterialRegist.Amount));
SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialStatic.aspx.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
{
string EMaterialRegistId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_EMaterialRegist eMaterialRegist = db.HJGL_EMaterialRegist.First(e => e.EMaterialRegistId == EMaterialRegistId);
SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs
+1 -1
View File
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string ElectrodeRecoveryId = Grid1.DataKeys[rowIndex][0].ToString();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.HJGL_ElectrodeRecovery electrodeRecovery = db.HJGL_ElectrodeRecovery.First(e => e.ElectrodeRecoveryId == ElectrodeRecoveryId);
BLL.HJGL_ElectrodeRecoveryService.DeleteElectrodeRecoveryItem(this.CurrUser.LoginProjectId, electrodeRecovery.UnitId, ElectrodeRecoveryId);
db.HJGL_ElectrodeRecovery.DeleteOnSubmit(electrodeRecovery);
SGGL/FineUIPro.Web/HJGL/TestPackageManage/ShowJointInfoView.aspx.cs
+1 -1
View File
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
string date = string.Empty;
if (JOT_ID != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var ProessDate = (from x in db.HJGL_HotProess_Report where x.WeldJointId == JOT_ID.ToString() && x.ProessDate != null select x.ProessDate).FirstOrDefault();
if (ProessDate != null)
{
SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs
+1 -1
View File
@@ -1958,7 +1958,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage
bool b = true;
if (ISO_ID != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var jointIds = (from x in db.PW_JointInfo where x.ISO_ID == ISO_ID.ToString() && x.IS_Proess == "1" select x.JOT_ID).ToList();
var notCompletedviews = from x in db.View_HJGL_HotProess_TrustItem where x.ProjectId == this.CurrUser.LoginProjectId && jointIds.Contains(x.WeldJointId) && x.IsCompleted != "完成" select x;
if (notCompletedviews.Count() > 0)
SGGL/FineUIPro.Web/HSSE/EduTrain/PlanView.aspx.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/HSSE/EduTrain/TestPlanView.aspx.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.EduTrain
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/HSSE/Epidemic/PersonList.aspx.cs
+1 -1
View File
@@ -165,7 +165,7 @@ namespace FineUIPro.Web.HSSE.Epidemic
/// </summary>
private void BindGrid()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (this.tvProjectAndUnit != null && !string.IsNullOrEmpty(this.tvProjectAndUnit.SelectedNodeID))
{
SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
+2 -2
View File
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
@@ -219,7 +219,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <param name="e"></param>
protected void drpUnit_OnSelectedIndexChanged(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
this.drpWorkArea.Items.Clear();
this.drpResponsibleMan.Items.Clear();
SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs
+1 -1
View File
@@ -710,7 +710,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
/// <param name="endTime"></param>
private void GetData(DateTime startTime, DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
//死亡事故
var accidentReports1 = BLL.AccidentReportService.GetAccidentReportsByAccidentTypeAndTime(startTime, endTime, this.ProjectId, "1");
SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs
+1 -1
View File
@@ -471,7 +471,7 @@ namespace FineUIPro.Web.InformationProject
/// <param name="endTime"></param>
private void GetData(DateTime startTime, DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
int? sumTotalPanhours = 0;
SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs
+1 -1
View File
@@ -545,7 +545,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
/// <param name="endTime"></param>
private void GetData(DateTime startTime, DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
decimal sumPersonWorkTimeTotal = 0;
//获取当期人工时日报
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.HSSE.Manager
{
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var q = from x in db.Manager_PersonSortC
where x.MonthReportId == MonthReportId
select x;
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs
+1 -1
View File
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef;
//危险源情况
hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//5.1.2 本月文件、方案修编情况说明
plans = (from x in db.Manager_Month_PlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (plans.Count > 0)
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.nbMainCost1.Text = (monthReport.MainCost1 ?? 0).ToString();
this.nbMainProjectCost1.Text = (monthReport.MainProjectCost1 ?? 0).ToString();
this.nbSubCost1.Text = (monthReport.SubCost1 ?? 0).ToString();
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//7.1 管理绩效数据统计(表一)
accidentDesciptions = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (accidentDesciptions.Count > 0)
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//9.1 危险源动态识别及控制
hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (hazards.Count > 0)
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs
+1 -1
View File
@@ -99,7 +99,7 @@ namespace FineUIPro.Web.HSSE.Manager
{
this.lblEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.EndDate);
}
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var q = from x in db.Manager_PersonSortC
where x.MonthReportId == MonthReportId
select x;
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HSSE.Manager
{
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var q = from x in db.Manager_PersonSortC
where x.MonthReportId == MonthReportId
select x;
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView4.aspx.cs
+1 -1
View File
@@ -162,7 +162,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef;
//危险源情况
hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView5.aspx.cs
+1 -1
View File
@@ -95,7 +95,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//5.1.2 本月文件、方案修编情况说明
plans = (from x in db.Manager_Month_PlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (plans.Count > 0)
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView6.aspx.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.nbMainCost1.Text = (monthReport.MainCost1 ?? 0).ToString();
this.nbMainProjectCost1.Text = (monthReport.MainProjectCost1 ?? 0).ToString();
this.nbSubCost1.Text = (monthReport.SubCost1 ?? 0).ToString();
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView7.aspx.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.MonthReportId = monthReport.MonthReportId;
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//7.1 管理绩效数据统计(表一)
accidentDesciptions = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (accidentDesciptions.Count > 0)
SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs
+1 -1
View File
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.HSSE.Manager
this.ProjectId = monthReport.ProjectId;
months = Convert.ToDateTime(monthReport.Months);
this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//9.1 危险源动态识别及控制
hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList();
if (hazards.Count > 0)
SGGL/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.cs
+2 -2
View File
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (compileDate != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
DateTime date = Convert.ToDateTime(compileDate);
var q = from y in db.SitePerson_DayReportDetail
where
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (compileDate != null)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
DateTime date = Convert.ToDateTime(compileDate);
var q = from y in db.SitePerson_DayReportDetail where (from z in db.SitePerson_DayReport where z.CompileDate <= date && z.ProjectId == this.CurrUser.LoginProjectId select z.DayReportId).Contains(y.DayReportId) select y;
if (q.Count() > 0)
SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportEdit.aspx.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </summary>
private void BindGrid()
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var q = from x in db.SitePerson_DayReportDetail
join a in db.SitePerson_DayReport
on x.DayReportId equals a.DayReportId
SGGL/FineUIPro.Web/HSSE/SitePerson/DayReportView.aspx.cs
+1 -1
View File
@@ -134,7 +134,7 @@ namespace FineUIPro.Web.SitePerson
/// </summary>
private void BindGrid()
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
if (this.nowData == "-1")
{
var q = (from x in db.SitePerson_DayReportDetail
SGGL/FineUIPro.Web/HSSE/SitePerson/MonthReportEdit.aspx.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </summary>
private void BindGrid()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!string.IsNullOrWhiteSpace(this.MonthReportId))
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </summary>
private void BindGrid()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string unitId = string.Empty;
string projectId = string.Empty;
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs
+1 -1
View File
@@ -394,7 +394,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var allPersons = from x in db.SitePerson_Person select x;
//var persons = db.SitePerson_Person
// .GroupBy(x => x.IdentityCard)
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </summary>
private void BindGrid()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (this.tvProjectAndUnit != null && !string.IsNullOrEmpty(this.tvProjectAndUnit.SelectedNodeID))
{
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListAll.aspx.cs
+1 -1
View File
@@ -154,7 +154,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </summary>
private void BindGrid()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string strSql = "select b.ProjectName , a.* from View_SitePerson_PersonList a left join Base_Project b on a.ProjectId = b.ProjectId Where ";
SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs
+1 -1
View File
@@ -241,7 +241,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// <returns></returns>
protected string ConvertTrainResult(object PersonId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
string result = string.Empty;
if (PersonId != null)
SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolutionView.aspx.cs
+6 -6
View File
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -201,7 +201,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -252,7 +252,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -313,7 +313,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -344,7 +344,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs
+7 -7
View File
@@ -1083,7 +1083,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
private void initDropSameGroup(DropDownList drop , string type)
{
List<Sys_User> users = new List<Sys_User>();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
switch (type)
{
@@ -1178,7 +1178,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1209,7 +1209,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trTwo.Nodes.Add(rootNode);
trTwo.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1260,7 +1260,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1290,7 +1290,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trFour.Nodes.Add(rootNode);
trFour.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1321,7 +1321,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
@@ -1352,7 +1352,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew
rootNode.EnableCheckEvent = true;
trSixe.Nodes.Add(rootNode);
trSixe.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanAudit.aspx.cs
+3 -3
View File
@@ -1732,7 +1732,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan
/// <param name="cnProfessionId"></param>
private void MergeWbsSetDetail(string cnProfessionId)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
// 分部分项
var wbsSetList4 = from x in db.WbsDetail
join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId
@@ -1895,7 +1895,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan
/// <param name="cnProfessionId"></param>
private void MergeWbsSetDetail2(string unitProjectId)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
// 分部分项
var wbsSetList4 = from x in db.WbsDetail
join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId
@@ -2031,7 +2031,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan
private void AddWbsSetDetail(string toWbs, DateTime months, decimal planValue, decimal completeValue, decimal realValue, int toFlag)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
decimal? weight = null;
if (toFlag == 4)
{
SGGL/FineUIPro.Web/JDGL/WBSPlan/WBSPlanSet.aspx.cs
+2 -2
View File
@@ -1987,7 +1987,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan
/// <param name="cnProfessionId"></param>
private void MergeWbsSetDetail(string cnProfessionId)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
// 分部分项
var wbsSetList4 = from x in db.WbsDetail
join y in db.Wbs_WbsSet on x.ToWbs equals y.WbsSetId
@@ -2148,7 +2148,7 @@ namespace FineUIPro.Web.JDGL.WBSPlan
private void AddWbsSetDetail(string toWbs, DateTime months, decimal planValue, decimal completeValue, decimal realValue, int toFlag)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
decimal? weight = null;
if (toFlag == 4)
{
SGGL/FineUIPro.Web/Login.aspx.cs
+1 -1
View File
@@ -305,7 +305,7 @@ namespace FineUIPro.Web
sysUser.RawPassword = "XJYJ." + idcard.Substring(idcard.Length - 4, 4);
sysUser.Password = Funs.EncryptionPassword(sysUser.RawPassword);
Funs.DB.SubmitChanges();
return "重置成功，默认密码是 XJYJ+'.'+身份证号码后四位,请登录";
return "重置成功，默认密码是：XJYJ+'.'+身份证号码后四位，请登录";
}
}
}
SGGL/FineUIPro.Web/Person/EduTrain/PlanView.aspx.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person.EduTrain
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/Person/EduTrain/TestPlanView.aspx.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.Person.EduTrain
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person.EduTrain
protected void Page_Load(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
if (!IsPostBack)
{
SGGL/FineUIPro.Web/ProjectData/ShowMainItem.aspx.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.ProjectData
private void InitTree(string id, string unitWorkId)
{
this.tvMenu.Nodes.Clear();
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var mainItems = from x in db.ProjectData_MainItem where x.ProjectId == this.CurrUser.LoginProjectId select x;
string otherIds = string.Empty;
SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs
+1 -1
View File
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
BLL.DivisionProjectService.DeleteDivisionProjectByUnitWorkId(rowID);
BLL.UnitWorkService.DeleteUnitWorkById(rowID);
//Model.SGGLDB db = Funs.DB;
//Model.CNPCDB db = Funs.DB;
//var q1 = from x in db.WBS_BreakdownProject where x.UnitWorkId == rowID select x;
//db.WBS_BreakdownProject.DeleteAllOnSubmit(q1);
//var q2 = from x in db.WBS_DivisionProject where x.UnitWorkId == rowID select x;
SGGL/FineUIPro.Web/SubPackManage/SubPackBlackRemark.aspx.cs
+1 -1
View File
@@ -108,7 +108,7 @@ namespace FineUIPro.Web.SubPackManage
Alert.Show("黑名单保存缺少必要数据，无法保存", MessageBoxIcon.Warning);
return;
}
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.SubPack_Blacklist newBlack = new Model.SubPack_Blacklist();
var blackList = db.SubPack_Blacklist.FirstOrDefault(p => p.BlackForeignKey == this.BlackForeignKey && p.BlackType == this.BlackType && p.IDCard == this.IDCard && p.ProjectID == this.ProjectID);
if (blackList == null)
SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
+1 -1
View File
@@ -396,7 +396,7 @@ namespace FineUIPro.Web.SysManage
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
var db = new Model.SGGLDB(Funs.ConnString);
var db = new Model.CNPCDB(Funs.ConnString);
//var sysSet = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_Synchronization).FirstOrDefault();
//if (sysSet != null)
//{
SGGL/FineUIPro.Web/SysManage/UserList.aspx
+2 -2
View File
@@ -48,8 +48,8 @@
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="Button1" OnClick="btnImport1_Click" runat="server" Text="从主数据平台同步" ToolTip="从主数据平台同步" Icon="ApplicationGet" >
</f:Button>
<%--<f:Button ID="Button1" OnClick="btnImport1_Click" runat="server" Text="从主数据平台同步" ToolTip="从主数据平台同步" Icon="ApplicationGet" >
</f:Button>--%>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
+9 -2
View File
@@ -320,8 +320,14 @@
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UserIn.aspx", "导入 - ")));
}
#endregion
protected void btnImport1_Click(object sender, EventArgs e)
#endregion
/// <summary>
/// 从主数据平台同步
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnImport1_Click(object sender, EventArgs e)
{
//同步项目
int total = 10;
@@ -403,6 +409,7 @@
BindGrid();
}
/// <summary>
/// 关闭导入弹出窗口
/// </summary>
SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs
Generated
+163 -172
View File
@@ -11,196 +11,187 @@ namespace FineUIPro.Web.SysManage
{
public partial class UserList
{
public partial class UserList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtUserName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserName;
/// <summary>
/// txtUserName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserName;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpDepart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDepart;
/// <summary>
/// drpDepart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDepart;
/// <summary>
/// drpRole 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRole;
/// <summary>
/// drpRole 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRole;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// lbtnPro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnPro;
/// <summary>
/// lbtnPro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnPro;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
}
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx.cs
+2 -2
View File
@@ -110,7 +110,7 @@
}
protected void btnStart_Click(object sender, EventArgs e)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
List<Model.InterFaceSet> FaceList = db.InterFaceSet.Where(p=>p.IsOpen==true).ToList();
foreach(var item in FaceList)
{
@@ -121,7 +121,7 @@
protected void btnFor_Click(object sender, EventArgs e)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
List<Model.InterFaceSet> FaceList = db.InterFaceSet.Where(p => p.IsOpen == true).ToList();
foreach (var item in FaceList)
{
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs
+1 -1
View File
@@ -252,7 +252,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
/// <param name="endTime"></param>
private void GetData(DateTime startTime, DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
}
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
+1 -1
View File
@@ -438,7 +438,7 @@ namespace FineUIPro.Web.ZHGL.Information
JArray getData = JArray.Parse(obj["data"].ToString());
if (getData.Count() > 0)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
int i = 0;
string actionWorkLedgerId = SQLHelper.GetNewID();
SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs
+1 -1
View File
@@ -438,7 +438,7 @@ namespace FineUIPro.Web.ZHGL.Information
JArray getData = JArray.Parse(obj["data"].ToString());
if (getData.Count() > 0)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
int i = 0;
string SafetyProductionEvaluationId = SQLHelper.GetNewID();
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs
+1 -1
View File
@@ -545,7 +545,7 @@ namespace FineUIPro.Web.ZHGL.RealName
sucess = obj["success"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.PersonInOutId == item.PersonInOutId);
if (getPersonInOutNow != null)
SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs
+1 -1
View File
@@ -413,7 +413,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck
JArray getData = JArray.Parse(obj["data"].ToString());
if (getData.Count() > 0)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
List<string> ids = new List<string>();
foreach (var item in getData)
SGGL/FineUIPro.Web/common/main0.aspx.cs
+1 -1
View File
@@ -312,7 +312,7 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
//List<double> listdata2 = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
foreach (var project in projects)
{
listCategories.Add(project.ShortName);
SGGL/FineUIPro.Web/common/main3.aspx.cs
+5 -5
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.common
{
if (!IsPostBack)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.divMajorProjectsUnderConstructionNum.InnerHtml = (from x in db.Solution_LargerHazard
where x.States == "2" && x.RecordTime > Const.DtmarkTime
select x).Count().ToString();
@@ -82,7 +82,7 @@ namespace FineUIPro.Web.common
/// <summary>
/// 项目信息
/// </summary>
private List<Model.Base_Project> getProjectInfo(Model.SGGLDB db)
private List<Model.Base_Project> getProjectInfo(Model.CNPCDB db)
{
ProjectInfo = "[]";
var getProjects = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false));
@@ -201,7 +201,7 @@ namespace FineUIPro.Web.common
/// <summary>
/// 获取安全人工时
/// </summary>
private void getPersonWorkTime(Model.SGGLDB db)
private void getPersonWorkTime(Model.CNPCDB db)
{
int wHours = 0;
var getMax = from x in db.SitePerson_DayReportDetail
@@ -221,7 +221,7 @@ namespace FineUIPro.Web.common
/// <summary>
/// 劳务统计
/// </summary>
private void getSitePerson(Model.SGGLDB db)
private void getSitePerson(Model.CNPCDB db)
{
int AllCount = 0;
int MCount = 0;
@@ -261,7 +261,7 @@ namespace FineUIPro.Web.common
/// <summary>
/// 获取质量问题
/// </summary>
private void getCQMSProblem(Model.SGGLDB db)
private void getCQMSProblem(Model.CNPCDB db)
{
CQualifiedRate = 0;
SGGL/FineUIPro.Web/common/mainI.aspx.cs
+1 -1
View File
@@ -316,7 +316,7 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
//List<double> listdata2 = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
foreach (var project in projects)
{
listCategories.Add(project.ProjectCode);
SGGL/FineUIPro.Web/common/mainIII.aspx.cs
+2 -2
View File
@@ -596,7 +596,7 @@ namespace FineUIPro.Web.common
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//一次检测合格焊口数
int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
@@ -634,7 +634,7 @@ namespace FineUIPro.Web.common
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//项目焊口数
int allJotNum = (from x in db.HJGL_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
this.divPersonTrainNum.InnerText = (from x in db.Comprehensive_InspectionPerson
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsTrain == true
select x).Count().ToString();
SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
+3 -3
View File
@@ -96,7 +96,7 @@ namespace FineUIPro.Web
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
@@ -230,7 +230,7 @@ namespace FineUIPro.Web
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
@@ -266,7 +266,7 @@ namespace FineUIPro.Web
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx
+932
View File
@@ -0,0 +1,932 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="mainMenu_Staff.aspx.cs" Inherits="FineUIPro.Web.mainMenu_Staff" %>
<!DOCTYPE html>
<html>
<head id="Head1" runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>首页</title>
<link href="../res/index/css/reset.css" rel="stylesheet" />
<link href="../res/index/css/home.css" rel="stylesheet" />
<link href="../res/index/css/swiper-3.4.2.min.css" rel="stylesheet" />
<style type="text/css">
* {
box-sizing: border-box;
}
.flexV {
flex-direction: column;
}
.wrap {
height: 100%;
padding: 15px;
}
.bottom-wrap {
padding: 0;
margin-bottom: 5px;
}
.bottom-wrap:last-child {
margin-bottom: 0;
}
.bw-item-content {
padding: 5px;
}
.top {
display: flex;
display: -webkit-flex;
overflow: hidden;
width: 100%;
}
.bw-b-bottom {
width: 100%;
height: 100%;
}
.itemlr {
margin: 0 5px;
}
.bw-b-bottom-up {
border-radius: 0;
height: 100%;
margin: 0;
box-shadow: none;
}
.yj-info {
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
color: red;
font-size: 20px;
}
.yj-info .tit {
font-weight: 700;
margin-bottom: 20px;
}
.yj-info .tel {
font-weight: 700;
}
.tab-wrap {
left: auto;
right: 15px;
top: 5px;
}
.tab .t-item {
width: auto;
padding: 5px 10px;
}
.bottom-list {
height: 100px;
padding: 15px;
overflow: hidden;
color: #fff;
margin: 0 10px;
}
.bottom-list .bl-left {
float: left;
margin-right: 30px;
margin-left: 50px;
}
.bottom-list .bl-right {
float: right;
margin-right: 50px;
}
.tab .t-item {
font-size: 12px;
}
.content-body {
display: flex;
flex-direction: column;
flex: 3;
}
.content-body .content-item {
}
.part-item {
display: flex;
align-items: center;
}
.part-tag {
display: flex;
flex-direction: column;
background-color: #107ca2;
opacity: 0.8;
flex: 1;
border-radius: 10px;
}
.part-tag + .part-tag {
margin-left: 20px;
}
.item-top {
display: flex;
justify-content: center;
align-items: center;
font-size: 20px;
color: #fff;
border-bottom: 1px solid #f2f2f2;
padding: 10px 0px;
}
.unit {
display: flex;
justify-content: flex-end;
text-align: right;
font-size: 16px;
padding-right: 30px;
}
.num {
display: flex;
justify-content: center;
flex: 1;
}
.unit-btn {
display: flex;
justify-content: center;
padding: 10px 0px;
font-size: 16px;
color: #fff;
}
.do-btn {
display: flex;
justify-content: center;
background-color: #107ca2;
opacity: 0.8;
flex: 1;
border-radius: 10px;
padding: 20px 0px;
color: #fff;
}
.base-wrap{
padding:15px 10px;
height:100%;
}
.base-wrap .base-tit{
font-size:12px;
color:#333
}
.base-wrap .base-txt-wrap{
margin-top:5px;
background-color:#f2f5f7;
border-radius:5px;
color:#FFAE72;
height:100%;
align-items:center;
justify-content:space-around;
}
.base-wrap .base-txt-wrap .num-1{
background-color:#2A759C;
padding:5px;
font-size:40px;
}
.yj-info-1{
height:100%;
}
.yj-info-1-list{
color:#fff;
}
.yj-info-1 .telbg{
height:100%;
width:85px;
background: url(../res/index/images/tel.png) center center no-repeat;
background-size: contain;
}
.yj-info-1-list-item{
padding:0 5px;
background-color:#2A759C;
margin-bottom:5px;
font-size:12px;
align-items:center;
justify-content:center;
}
.yj-info-1-list-item:last-child{
margin-bottom:0;
}
.yj-info-1-list-item .telnum{
text-align:center;
align-items:center;
justify-content:center;
display:flex;
}
.yj-info-1-info{
color:#fff;
background-color:#2A759C;
text-align:center;
font-size:16px;
height:40px;
line-height:40px;
margin-top:5px;
}
</style>
</head>
<body>
<div class="wrap flex flexV">
<div class="bottom-wrap flex1">
<div class="top">
<div class="item flex1">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content pd0">
<div class="base-wrap flex flexV">
<div class="base-tit">当前现场总人数</div>
<div class="base-txt-wrap flex flex1">
<div class="num-1 specialNum" runat="server" id="divperson">0</div>
<div class="num-1 specialNum" runat="server" id="person00">0</div>
<div class="num-1 specialNum" runat="server" id="person01">0</div>
<div class="num-1 specialNum" runat="server" id="person02">0</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="item flex3 itemlr">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div id='two' style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
</div>
<div class="item flex1">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div class="yj-info-1 flex flexV">
<div class="flex flex1">
<div style="height:100%;">
<div class="telbg"></div>
</div>
<div class="flex1 flex flexV yj-info-1-list">
<div class="flex flex1 yj-info-1-list-item">
<div class="flex1 telnum">110</div>
<div>报警</div>
</div>
<div class="flex flex1 yj-info-1-list-item">
<div class="flex1 telnum">119</div>
<div>消防</div>
</div>
<div class="flex flex1 yj-info-1-list-item">
<div class="flex1 telnum">120</div>
<div>急救</div>
</div>
<div class="flex flex1 yj-info-1-list-item">
<div id="xmb" runat="server" class="flex1 telnum"></div>
<div>项目部</div>
</div>
</div>
</div>
<div class="yj-info-1-info">
<button type="button" class="yj-info-1-info" onclick="ope();" style="width: 100%;vertical-align: middle;border: none;height: auto;line-height:1;">应 急 流 程</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="bottom-wrap flex1">
<div class="top">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="tab-wrap">
<div class="tab" data-value="4">
<div class="t-item active">施工分包商</div>
<div class="spline"></div>
<div class="t-item">问题类别</div>
</div>
</div>
<div class="bw-item-content">
<div id='four' style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
</div>
</div>
<div class="bottom-wrap flex1">
<div class="top">
<div class="item flex1">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div id='three' style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
</div>
<div class="item flex2 itemlr">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div id='five' style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
</div>
<div class="item flex1">
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div id='six' style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<script type="text/javascript" src="../res/index/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
var basePath = '<%= ResolveUrl("~/") %>';
function ope() {
parent.addExampleTab({
id: 'hello_fineui_tab',
iframeUrl: basePath + 'HSSE/Emergency/EmergencyProcess.aspx',
title: '应急流程',
refreshWhenExist: true
});
}
function category_Two(id, xArr, data) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: {
left: 'center',
text: '项目安全人工时',
textStyle: {
color: '#333',
fontSize: 12,
fontWeight: '300'
},
show: true
},
tooltip: {},
legend: {
show: false
},
xAxis: {
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
/*interval: 0,*/
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
},
type: 'category',
data: xArr
},
yAxis: {
axisTick: {
show: false
},
axisLine: {
show: false,
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
}
},
series: data,
grid: {
top: '15%',
left: '10',
right: '10',
bottom: '10%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
},
itemStyle: {
color: 'rgba(9,199,113, 1)'
},
backgroundColor: 'rgba(0,162,233, 0.01)',
textStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
}
// 使用刚指定的配置项和数据显示图表。
if (xArr.length > 5) {
option.dataZoom = [{
type: 'slider',
show: true,
startValue: 0,
endValue: 4,
height: '10',
backgroundColor: 'rgba(47,69,84,0)',
fillerColor: 'rgba(0,162,233, 1)',
bottom: '0%',
zoomLock: true,
moveOnMouseWheel: true,
brushSelect: true,
showDetail: false,
}]
}
myChart.setOption(option)
}
var two =<%=Two %>;
var xArr = two.categories
var data = [{
name: '累计人工时',
type: 'bar',
/*barWidth: 40,*/
data: two.series[0].data
}]
category_Two('two', xArr, data)
</script>
<script type="text/javascript">
function category_Three(id, xArr, data) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: {
left: 'center',
text: '作业许可数量统计',
textStyle: {
color: '#333',
fontSize: 12,
fontWeight: '300'
},
show: true
},
tooltip: {},
legend: {
show: false
},
yAxis: {
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)',
fontSize: 10,
}
}
},
xAxis: {
axisTick: {
show: false
},
axisLine: {
show: false,
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
},
type: 'category',
data: xArr
},
series: data,
grid: {
top: '15%',
left: '10',
right: '10',
bottom: '0%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
},
itemStyle: {
color: 'rgba(200,201,10, 1)'
},
backgroundColor: 'rgba(0,162,233, 0.01)',
textStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
}
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var three =<%=Three %>;
var xArr = three.categories
var data = [{
name: '作业许可数量统计',
type: 'bar',
data: three.series[0].data,
itemStyle: { normal: { color: '#7BB259' } }
}]
category_Three('three', xArr, data)
</script>
<script type="text/javascript">
function category_Four(id, xArr, series) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: {
// left:'center',
text: '安全检查问题统计',
textStyle: {
color: '#333',
fontSize: 12,
fontWeight: '300',
},
show: true
},
tooltip: {},
color: ['#88cc00', '#AE4B23'],
legend: {
left: '15%',
show: true,
textStyle: {//图例文字的样式
color: '#333',
fontSize: 10,
}
},
xAxis: {
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
interval: 0,
formatter: function (params) {
var newParamsName = "";// 最终拼接成的字符串
var paramsNameNumber = params.length;// 实际标签的个数
var provideNumber = 14;// 每行能显示的字的个数
var rowNumber = Math.ceil(paramsNameNumber / provideNumber);// 换行的话，需要显示几行，向上取整
/**
* 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
*/
// 条件等同于rowNumber>1
if (paramsNameNumber > provideNumber) {
/** 循环每一行,p表示行 */
for (var p = 0; p < rowNumber; p++) {
var tempStr = "";// 表示每一次截取的字符串
var start = p * provideNumber;// 开始截取的位置
var end = start + provideNumber;// 结束截取的位置
// 此处特殊处理最后一行的索引值
if (p == rowNumber - 1) {
// 最后一次不换行
tempStr = params.substring(start, paramsNameNumber);
} else {
// 每一次拼接字符串并换行
tempStr = params.substring(start, end) + "\n";
}
newParamsName += tempStr;// 最终拼成的字符串
}
} else {
// 将旧标签的值赋给新标签
newParamsName = params;
}
//将最终的字符串返回
return newParamsName
},
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
},
type: 'category',
data: xArr
},
yAxis: {
axisTick: {
show: false
},
axisLine: {
show: false,
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
}
},
series: series,
grid: {
top: '25%',
left: '0%',
right: '0%',
bottom: '0%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
},
//itemStyle: {
// color: 'rgba(200,201,10, 1)'
//},
backgroundColor: 'rgba(0,162,233, 0.01)',
textStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
}
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var four1 =<%=Four1 %>;
var xArr = four1.categories
var series = [{
name: '待整改',
type: 'bar',
barWidth: 20,
barGap:0.05,
data: four1.series[0].data,
itemStyle: { normal: { color: '#88cc00' } }
}, {
name: '全部',
type: 'bar',
barWidth: 20,
data: four1.series[0].data2,
itemStyle: { normal: { color: '#AE4B23' } }
}];
category_Four('four', xArr, series)
</script>
<script type="text/javascript">
function category_Five(id, xArr, data) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: {
left: 'center',
text: '入场安全培训',
textStyle: {
color: '#333',
fontSize: 12,
fontWeight: '300'
},
show: true
},
tooltip: {},
legend: {
show: false
},
xAxis: {
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
/*interval: 0,*/
fontSize:10,
rotate: 15,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
},
type: 'category',
data: xArr
},
yAxis: {
axisTick: {
show: false
},
axisLine: {
show: false,
lineStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
},
axisLabel: {
show: true,
textStyle: {
color: 'rgba(51, 51, 51, 0.8)'
}
}
},
series: data,
grid: {
top: '15%',
left: '10',
right: '10',
bottom: '0%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
},
itemStyle: {
color: 'rgba(200,201,10, 1)'
},
backgroundColor: 'rgba(0,162,233, 0.01)',
textStyle: {
color: 'rgba(51, 51, 51, 0.3)'
}
}
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var five =<%=Five %>;
var xArr = five.categories
var data = [{
name: '总数',
type: 'line',
smooth: true,
data: five.series[1].data,
itemStyle: { normal: { color: 'rgba(0, 255, 0, 1)' } }
},{
name: '当月',
type: 'bar',
/*barWidth: 30,*/
data: five.series[0].data
}]
category_Five('five', xArr, data)
</script>
<script type="text/javascript">
function category_six(id, xArr, data,data2) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: [{
text: '事故统计',
top: '0',
left: '30%',
textStyle: {
color: '#333',
fontSize: 12,
fontWeight: 300
}
}],
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)'
},
legend: {
orient: 'vertical',
right: 20,
top: 'center',
data: ['人身伤害', '未遂事故', '火灾', '机械设备', '环境影响', '其他'],
textStyle: {//图例文字的样式
color: '#f2f2f2',
fontSize: 10,
}
},
graphic: {
type: "text",
left: "36%",
top: "52%",
style: {
text: data2,
textAlign: "center",
fill: "#333",
fontSize: 18,
fontWeight: 600
}
},
color: ['#CFE5B7', '#BBD4A4', '#A3C78A', '#88B53D', '#7CA63B', '#698E30'],
series: [
{
name: '事故统计',
type: 'pie',
center: ['38%', '55%'],
radius: ['40%', '78%'],
avoidLabelOverlap: false,
label: {
show: false,
position: 'inside',
formatter: function (data) { return data.percent.toFixed(2); }
},
labelLine: {
show: false
},
data: [
{ value: data[0], name: '人身伤害' },
{ value: data[1], name: '未遂事故' },
{ value: data[2], name: '火灾' },
{ value: data[3], name: '机械设备' },
{ value: data[4], name: '环境影响' },
{ value: data[5], name: '其他' }
],
itemStyle: {
normal: {
borderWidth: 3,
borderColor: 'rgba(218,235,234, 1)'
}
}
}
]
}
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var six=<%=Six %>;
var xArr = ["分包一", "分包二"]
var data = six.series[0].data
var data2 = data[0]+data[1]+data[2]+data[3]+data[4]+data[5]
category_six('six', xArr, data,data2)
</script>
<script type="text/javascript">
$(".tab .t-item").click(function () {
var $this = $(this)
var index = $this.index()
if ($this.hasClass('active') && index == 0) {
return
}
var $tab = $this.closest(".tab")
var value = $tab.attr("data-value")
$tab.find(".t-item").removeClass('active');
$this.addClass('active')
var four1 =<%=Four1 %>;
var four2 =<%=Four2 %>;
if (value == 4) {
var xArr = four1.categories
var data = [{
name: '待整改',
type: 'bar',
data: four1.series[0].data
}, {
name: '全部',
type: 'bar',
data: four1.series[0].data2,
itemStyle: { normal: { color: 'rgba(174,75,37, 1)' } }
}];
if (index == 2) {
var xArr = four2.categories
var data = [{
name: '待整改',
data: four2.series[0].data
}, {
name: '全部',
data: four2.series[0].data2,
itemStyle: { normal: { color: 'rgba(174,75,37, 1)' } }
}];
}
category_Four('four', xArr, data)
}
})
</script>
</html>
SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.cs
+392
View File
@@ -0,0 +1,392 @@
using BLL;
using FineUIPro.Web.HSSE.License;
using Newtonsoft.Json;
using System;
using System.CodeDom;
using System.Collections.Generic;
using System.Linq;
namespace FineUIPro.Web
{
public partial class mainMenu_Staff : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
getHazardRegisterLists = HSSE_Hazard_HazardRegisterService.GetHazardRegisterListByProjectId(this.CurrUser.LoginProjectId);
///当前现场总人数
getSitePerson();
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (project != null && project.Telephone != null)
{
this.xmb.InnerHtml = project.Telephone;
}
getDayReportDetails = (from x in Funs.DB.SitePerson_DayReportDetail
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
where y.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
getProjectUnits = (from x in Funs.DB.Project_ProjectUnit
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
}
}
private static List<Model.SitePerson_DayReportDetail> getDayReportDetails;
private static List<Model.Project_ProjectUnit> getProjectUnits;
#region 当前现场总人数
/// <summary>
/// 当前现场总人数
/// </summary>
private void getSitePerson()
{
int AllCount = 0;
//var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
DateTime dateValue = DateTime.Now.AddDays(-1);
List<Model.PageDataPersonInOutItem> getallin = new List<Model.PageDataPersonInOutItem>();
var getInMaxs = from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
select new Model.PageDataPersonInOutItem
{
PersonId = x.PersonId,
PostType = y.PostType,
WorkPostId = x.WorkPostId,
};
if (getInMaxs.Count() > 0)
{
getallin = getInMaxs.Distinct().ToList();
}
//AllCount = getallin.Count();
var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord
join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
select x.IDCardNo).Distinct();
//if (AllCount > 0)
//{
// ////总人数
// this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
// this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
// this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
// this.person02.InnerHtml = (AllCount % 10).ToString();
//}
AllCount = getEmployInOutRecords.Count();
if (AllCount > 0)
{
////总人数
this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
this.person02.InnerHtml = (AllCount % 10).ToString();
}
}
#endregion
#region 项目安全人工时
/// <summary>
/// 项目安全人工时
/// </summary>
protected string Two
{
get
{
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
foreach (var item in getProjectUnits)
{
listCategories.Add(UnitService.GetShortUnitNameByUnitId(item.UnitId));
decimal total = getDayReportDetails.Where(x => x.UnitId == item.UnitId).Sum(x => x.PersonWorkTime ?? 0);
listdata.Add(Convert.ToDouble(total));
}
s.data = listdata;
series.Add(s);
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
#endregion
#region 作业许可数量统计
/// <summary>
/// 作业许可数量统计
/// </summary>
protected string Three
{
get
{
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "作业许可数量统计";
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
var qLicenseManager = ( from x in Funs.DB.License_LicenseManager.Where(xx=>xx.ProjectId==CurrUser.LoginProjectId)
join y in Funs.DB.Base_LicenseType
on x.LicenseTypeId equals y.LicenseTypeId into z
from zz in z
select new
{
x.LicenseTypeId,zz.LicenseTypeCode
}).ToList();
int FireWork = Funs.DB.License_FireWork.Where(x=>x.ProjectId==this.CurrUser.LoginProjectId && x.States== Const.State_3).Count();
int HeightWork = Funs.DB.License_HeightWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int LimitedSpace = Funs.DB.License_LimitedSpace.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int RadialWork = Funs.DB.License_RadialWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int OpenCircuit = Funs.DB.License_OpenCircuit.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int BreakGround = Funs.DB.License_BreakGround.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int NightWork = Funs.DB.License_NightWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
int LiftingWork = Funs.DB.License_LiftingWork.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.State_3).Count();
foreach(var item in qLicenseManager)
{
switch (item.LicenseTypeCode)
{
case "01":
case "4"://动火
FireWork++;
break;
case "06":
case "18":
case "2"://高处
HeightWork++;
break;
case "03":
case "7"://受限
LimitedSpace++;
break;
case "14":
case "04"://射线
RadialWork++;
break;
case "09":
case "5"://断路
OpenCircuit++;
break;
case "02":
case "8"://动土
BreakGround++;
break;
case ""://夜间
NightWork++;
break;
case "19":
case "05":
case "3"://吊装
LiftingWork++;
break;
}
}
listCategories.Add("动火");
listdata.Add(FireWork);
listCategories.Add("高处");
listdata.Add(HeightWork);
listCategories.Add("受限");
listdata.Add(LimitedSpace);
listCategories.Add("射线");
listdata.Add(RadialWork);
listCategories.Add("断路");
listdata.Add(OpenCircuit);
listCategories.Add("动土");
listdata.Add(BreakGround);
listCategories.Add("夜间");
listdata.Add(NightWork);
listCategories.Add("吊装");
listdata.Add(LiftingWork);
s.data = listdata;
series.Add(s);
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
#endregion
#region 安全检查问题统计
/// <summary>
///
/// </summary>
public static List<Model.HSSE_Hazard_HazardRegister> getHazardRegisterLists;
/// <summary>
/// 按单位统计
/// </summary>
protected string Four1
{
get
{
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
var hazardRegisters = from x in db.View_Hazard_HazardRegister where x.ProjectId == this.CurrUser.LoginProjectId select x;
if (hazardRegisters.Count() > 0)
{
var units = hazardRegisters.Select(x => x.ResponsibleUnit).Distinct().ToList();
foreach (var unit in units)
{
listCategories.Add(UnitService.GetShortUnitNameByUnitId(unit));
int state1 = hazardRegisters.Count(x => x.ResponsibleUnit == unit && x.States == "1");
int state2 = hazardRegisters.Count(x => x.ResponsibleUnit == unit);
listdata.Add(Convert.ToDouble(state1));
listdata2.Add(Convert.ToDouble(state2));
}
s.data = listdata;
s.data2 = listdata2;
series.Add(s);
}
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
/// <summary>
/// 按类型统计
/// </summary>
protected string Four2
{
get
{
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
var hazardRegisters = from x in db.View_Hazard_HazardRegister where x.ProjectId == this.CurrUser.LoginProjectId select x;
if (hazardRegisters.Count() > 0)
{
var types = hazardRegisters.Select(x => x.RegisterTypesName).Distinct().ToList();
foreach (var type in types)
{
listCategories.Add(type);
int state1 = hazardRegisters.Count(x => x.RegisterTypesName == type && x.States == "1");
int state2 = hazardRegisters.Count(x => x.RegisterTypesName == type);
listdata.Add(Convert.ToDouble(state1));
listdata2.Add(Convert.ToDouble(state2));
}
s.data = listdata;
s.data2 = listdata2;
series.Add(s);
}
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
#endregion
#region 入场安全培训
/// <summary>
/// 入场安全培训
/// </summary>
protected string Five
{
get
{
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "入场培训";
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
//// 每月培训数量
List<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
var getTrainRecord = from x in Funs.DB.EduTrain_TrainRecord
where x.ProjectId == this.CurrUser.LoginProjectId && x.TrainTypeId == Const.EntryTrainTypeId
select x;
var getTrainRecordDetail = from x in Funs.DB.EduTrain_TrainRecordDetail
join y in getTrainRecord on x.TrainingId equals y.TrainingId
select x;
DateTime startTime = DateTime.Now;
DateTime endTime = DateTime.Now;
var getProject = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (getProject != null && getProject.StartDate.HasValue)
{
startTime = getProject.StartDate.Value;
if (getProject.EndDate.HasValue && getProject.EndDate < DateTime.Now)
{
endTime = getProject.EndDate.Value;
}
}
int totalCout = 0;
for (int i = 0; startTime.AddMonths(i) <= endTime; i++)
{
listCategories.Add(string.Format("{0:yyyy-MM}", startTime.AddMonths(i)));
var getMontDetail = from x in getTrainRecordDetail
join y in getTrainRecord on x.TrainingId equals y.TrainingId
where y.TrainStartDate.Value.Year == startTime.AddMonths(i).Year && y.TrainStartDate.Value.Month == startTime.AddMonths(i).Month
select x;
listdata.Add(getMontDetail.Count());
totalCout = totalCout + getMontDetail.Count();
listdata2.Add(totalCout);
}
s.data = listdata;
s2.data = listdata2;
series.Add(s);
series.Add(s2);
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
#endregion
# region 事故统计
/// <summary>
/// 事故统计
/// </summary>
protected string Six
{
get
{
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
businessColumn.title = "事故统计";
var getAccident = from x in Funs.DB.Accident_AccidentReport
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "1" || x.AccidentTypeId == "2" || x.AccidentTypeId == "3" || x.AccidentTypeId == "4").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "5").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "6" || x.AccidentTypeId == "7").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "8" || x.AccidentTypeId == "9").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "10").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "11").Count());
s.data = listdata;
series.Add(s);
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
#endregion
}
}
SGGL/FineUIPro.Web/common/mainMenu_Staff.aspx.designer.cs
Generated
+71
View File
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web
{
public partial class mainMenu_Staff
{
/// <summary>
/// Head1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// divperson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson;
/// <summary>
/// person00 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person00;
/// <summary>
/// person01 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person01;
/// <summary>
/// person02 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person02;
/// <summary>
/// xmb 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl xmb;
}
}
SGGL/FineUIPro.Web/common/mainProject0.aspx.cs
+2 -2
View File
@@ -245,7 +245,7 @@ namespace FineUIPro.Web.common
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//一次检测合格焊口数
int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem
join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
@@ -283,7 +283,7 @@ namespace FineUIPro.Web.common
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//项目焊口数
int allJotNum = (from x in db.HJGL_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.common
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
//加载看板数据
loadData();
SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs
+4 -4
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.common
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
@@ -198,7 +198,7 @@ namespace FineUIPro.Web.common
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
var personQualitys = from x in db.SitePerson_Person
join y in db.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId
@@ -362,7 +362,7 @@ namespace FineUIPro.Web.common
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
@@ -395,7 +395,7 @@ namespace FineUIPro.Web.common
{
get
{
Model.SGGLDB db = Funs.DB;
Model.CNPCDB db = Funs.DB;
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
SGGL/FineUIPro.Web/indexProject.aspx
+2 -2
View File
@@ -280,8 +280,8 @@
<%--<div class="h-nav-bar h-nav-bar-active" data-id="1"><f:Button runat="server" CssClass="bgbtn" CssStyle="color: #ffffff;" Text="质量管理" OnClick="btnCQMS_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCQMS">
</f:Button></div>--%>
<div class="h-nav-bar" data-id="2"><f:Button runat="server" CssClass="bgbtn" Text="员工管理" CssStyle="color: #ffffff;" OnClick="btnHSSE_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHSSE">
<div class="h-nav-bar" data-id="2"><f:Button runat="server" CssClass="bgbtn" Text="员工管理" CssStyle="color: #ffffff;" OnClick="btnStaff_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnStaff">
</f:Button></div>
<%-- <div class="h-nav-bar" data-id="3"><f:Button runat="server" CssClass="bgbtn" Text="进度管理" CssStyle="color: #ffffff;" OnClick="btnJDGL_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnJDGL">
SGGL/FineUIPro.Web/indexProject.aspx.cs
+4
View File
@@ -677,6 +677,10 @@ namespace FineUIPro.Web
this.MenuSwitchMethod(Const.Menu_ProjectSet);
}
protected void btnStaff_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_Staff);
}
protected void btnHSSE_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_HSSE);
SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
Generated
+2 -2
View File
@@ -60,13 +60,13 @@ namespace FineUIPro.Web
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// btnHSSE 控件。
/// btnStaff 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnHSSE;
protected global::FineUIPro.Button btnStaff;
/// <summary>
/// btnHome 控件。