lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
@@ -47,7 +46,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
this.drpSubjectProject.SelectedValue = checkInfo.SubjectProjectId;
this.txtCheckLeader.Text = Person_PersonsService.GetPersonsNameById(checkInfo.CheckTeamLeader);
this. txtSubjectUnitMan.Text= Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
this.txtSubjectUnitMan.Text = Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
}
this.txtCheckMan.Text = this.CurrUser.PersonName;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
@@ -177,7 +176,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
JObject values = teamGroupRow.Value<JObject>("values"); bool isSelect = Convert.ToBoolean(values.Value<string>("IsSelect"));
if (isSelect)
{
{
var taleItem = Funs.DB.ProjectSupervision_Check1.FirstOrDefault(x => x.ID == values.Value<string>("ID"));
if (taleItem != null)
{
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs
+3 -5
View File
@@ -1,9 +1,7 @@
using BLL;
using FineUIPro.Web.HSSE.Check;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.OfficeCheck.Check
@@ -153,7 +151,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnEdit_Click(object sender, EventArgs e)
{
{
string window = String.Format("CheckNoticeEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetShowReference(window));
}
@@ -196,7 +194,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtCheckStartTime.Text = string.Empty;
this.txtCheckEndTime.Text = string.Empty;
this.txtCompileMan.Text = string.Empty;
this.txtCompileDate.Text = string.Empty;
this.txtCompileDate.Text = string.Empty;
this.lblResult.Text = string.Empty;
this.lblCheckReportResult.Text = string.Empty;
this.lblCheckResult.Text = string.Empty;
@@ -385,7 +383,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (getRectify != null && getRectify.States != "0" && !string.IsNullOrEmpty(getRectify.States))
{
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
}
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
+5 -5
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
if (!IsPostBack)
{
this.GetButtonPower();
this.GetButtonPower();
BLL.UnitService.InitSeDinAndCNCECUnitDropDownList(this.drpUnit, false);
BLL.DepartService.InitDepartDropDownList(this.drpDepart, true);
this.drpDepart.SelectedValue = Const.Depart_constructionId;
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.drpCheckTeamLeader.SelectedValue = checkNotice.SubjectUnitMan;
this.txtSubjectUnitAdd.Text = checkNotice.SubjectUnitAdd;
this.txtSubjectUnitTel.Text = checkNotice.SubjectUnitTel;
this.drpSex.SelectedValue = checkNotice.SexName;
this.hdUserId.Text = checkNotice.CheckTeamLeader;
}
@@ -86,7 +86,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
ShowNotify("请先填写检查组长!", MessageBoxIcon.Warning);
return;
}
Model.ProjectSupervision_CheckNotice newCheckNotice = new Model.ProjectSupervision_CheckNotice();
Model.ProjectSupervision_CheckNotice newCheckNotice = new Model.ProjectSupervision_CheckNotice();
newCheckNotice.SubjectUnitAdd = this.txtSubjectUnitAdd.Text.Trim();
if (this.drpSubjectUnitMan.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpSubjectUnitMan.SelectedValue))
{
@@ -148,7 +148,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
var units = BLL.ProjectService.GetProjectByProjectId(this.drpSubjectProject.SelectedValue);
if (units != null)
{
this.txtSubjectUnitAdd.Text = units.ProjectAddress;
this.txtSubjectUnitAdd.Text = units.ProjectAddress;
}
SitePerson_PersonService.InitSitePersonDropDownList(this.drpSubjectUnitMan, this.drpSubjectProject.SelectedValue, Const.UnitId_SEDIN, null, null, true);
}
@@ -209,7 +209,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
this.txtSubjectUnitTel.Text = getperson.Telephone;
}
}
}
}
}
}
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx.cs
+4 -4
View File
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
this.CheckNoticeId = Request.Params["CheckNoticeId"];
if (!string.IsNullOrEmpty(this.CheckNoticeId))
{
{
var checkReport = BLL.CheckReportService.GetCheckReportByCheckNoticeId(this.CheckNoticeId);
if (checkReport != null)
{
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtValues3.Text = checkReport.BasicInfo;
//this.txtValues4.Text = checkReport.ConformItem;
this.txtValues6.Text = checkReport.Opinion;
this.txtValues7.Text = checkReport.CheckResult;
this.txtValues7.Text = checkReport.CheckResult;
}
this.BindGrid2();
this.BindGrid();
@@ -133,8 +133,8 @@ namespace FineUIPro.Web.OfficeCheck.Check
where IsSelect=1 and DeletScore >0
and CheckNoticeId =@CheckNoticeId";
listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId));
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var table = this.GetPagedDataTable(Grid2, tb);
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using System;
namespace FineUIPro.Web.OfficeCheck.Check
@@ -167,7 +166,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (!string.IsNullOrEmpty(sysUser.UnitId))
{
this.drpUnit.SelectedValue = sysUser.UnitId;
this.drpUnit.Enabled = false;
this.drpUnit.Enabled = false;
}
this.drpSex.SelectedValue = sysUser.Sex == "0" ? "女" : "男";
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs
+10 -10
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
string type = Request.Params["type"];
if (type == "1")
{
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (!string.IsNullOrEmpty(getRectify.SignPerson))
{
this.drpSignPerson.SelectedValue = getRectify.SignPerson;
}
}
if (getRectify.States == Const.State_1 || getRectify.States == Const.State_2)
{
this.btnSure.Hidden = false;
@@ -103,11 +103,11 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtCheckPerson.Text += item.UserName + "、";
}
string perfix = DateTime.Now.Year.ToString()+ DateTime.Now.Month.ToString() + DateTime.Now.Day.ToString() + "-";
string perfix = DateTime.Now.Year.ToString() + DateTime.Now.Month.ToString() + DateTime.Now.Day.ToString() + "-";
this.txtRectifyNoticesCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3", "dbo.ProjectSupervision_Rectify", "RectifyCode", perfix);
}
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
BindGrid();
rectifyItemLists.Clear();
@@ -131,7 +131,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
public void BindGrid()
{
string strSql = string.Empty;
List <SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>();
if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyId == this.hdRectifyNoticesId.Text) != null)
{
strSql = @"select RectifyItemId,WrongContent,Requirement,LimitTime,RectifyResults,IsRectify,HiddenHazardType
@@ -186,8 +186,8 @@ namespace FineUIPro.Web.OfficeCheck.Check
string requirement = values.Value<string>("Requirement");
string rectifyResults = values.Value<string>("RectifyResults");
TextBox txtlimitTim = (TextBox)Grid1.Rows[i].FindControl("txtLimitTimes");
var item = new ProjectSupervision_RectifyItem();
item.RectifyItemId = rectifyNoticesItemId;
item.RectifyId = hdRectifyNoticesId.Text.Trim();
@@ -196,8 +196,8 @@ namespace FineUIPro.Web.OfficeCheck.Check
item.LimitTime = Funs.GetNewDateTime(txtlimitTim.Text);
item.RectifyResults = rectifyResults;
DropDownList drpIsRect = (DropDownList)Grid1.Rows[i].FindControl("drpIsRectify");
item.IsRectify =Convert.ToBoolean( drpIsRect.SelectedValue);
DropDownList drpHiddenHazardType = (DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardTypeify");
item.IsRectify = Convert.ToBoolean(drpIsRect.SelectedValue);
DropDownList drpHiddenHazardType = (DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardTypeify");
item.HiddenHazardType = drpHiddenHazardType.SelectedValue;
rectifyItemLists.Add(item);
}
@@ -267,7 +267,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
else
{
string checkReportItemId= Grid1.Rows[e.RowIndex].Values[12].ToString();
string checkReportItemId = Grid1.Rows[e.RowIndex].Values[12].ToString();
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", checkReportItemId, BLL.Const.CheckInfoMenuId)));
}
}