xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三库

Browse Source
This commit is contained in:
geh
2026-10-23 09:39:55 +08:00
parent 530ab7114a
commit 2e86cea781
17 changed files with 763 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
+52 -18
View File
@@ -7388,9 +7388,13 @@
<Compile Include="CQMS\BaseInfo\ProjectSysSet.aspx.designer.cs">
<DependentUpon>ProjectSysSet.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\Check\AdminPenalty.aspx.cs" />
<Compile Include="CQMS\Check\AdminPenalty.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\Check\AdminPenalty.aspx.designer.cs" />
<Compile Include="CQMS\Check\AdminPenaltyEdit.aspx.cs" />
<Compile Include="CQMS\Check\AdminPenaltyEdit.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\Check\AdminPenaltyEdit.aspx.designer.cs" />
<Compile Include="CQMS\Check\CheckFineList.aspx.cs">
<DependentUpon>CheckFineList.aspx</DependentUpon>
@@ -12685,7 +12689,9 @@
<Compile Include="indexProjectOld.aspx.designer.cs">
<DependentUpon>indexProjectOld.aspx</DependentUpon>
</Compile>
<Compile Include="ProjectData\DataGovernance.aspx.cs" />
<Compile Include="ProjectData\DataGovernance.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ProjectData\DataGovernance.aspx.designer.cs" />
<Compile Include="ProjectData\LocationSelect.aspx.cs">
<DependentUpon>LocationSelect.aspx</DependentUpon>
@@ -12719,9 +12725,13 @@
<Compile Include="ProjectData\MasterProjectDataUsage.aspx.designer.cs">
<DependentUpon>MasterProjectDataUsage.aspx</DependentUpon>
</Compile>
<Compile Include="ProjectData\PreProjectApply.aspx.cs" />
<Compile Include="ProjectData\PreProjectApply.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ProjectData\PreProjectApply.aspx.designer.cs" />
<Compile Include="ProjectData\PreProjectApplyList.aspx.cs" />
<Compile Include="ProjectData\PreProjectApplyList.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ProjectData\PreProjectApplyList.aspx.designer.cs" />
<Compile Include="ProjectData\ProjectDevices.aspx.cs">
<DependentUpon>ProjectDevices.aspx</DependentUpon>
@@ -12737,29 +12747,53 @@
<Compile Include="ProjectData\ProjectDevicesEdit.aspx.designer.cs">
<DependentUpon>ProjectDevicesEdit.aspx</DependentUpon>
</Compile>
<Compile Include="SanKu\AccidentRecord.aspx.cs" />
<Compile Include="SanKu\AccidentRecord.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\AccidentRecord.aspx.designer.cs" />
<Compile Include="SanKu\AdminPenalty.aspx.cs" />
<Compile Include="SanKu\AdminPenalty.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\AdminPenalty.aspx.designer.cs" />
<Compile Include="SanKu\DangerousEngineering.aspx.cs" />
<Compile Include="SanKu\DangerousEngineering.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\DangerousEngineering.aspx.designer.cs" />
<Compile Include="SanKu\DataValidation.aspx.cs" />
<Compile Include="SanKu\DataValidation.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\DataValidation.aspx.designer.cs" />
<Compile Include="SanKu\Examination.aspx.cs" />
<Compile Include="SanKu\Examination.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\Examination.aspx.designer.cs" />
<Compile Include="SanKu\GridPatrol.aspx.cs" />
<Compile Include="SanKu\GridPatrol.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\GridPatrol.aspx.designer.cs" />
<Compile Include="SanKu\Hazard.aspx.cs" />
<Compile Include="SanKu\Hazard.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\Hazard.aspx.designer.cs" />
<Compile Include="SanKu\ReportLog.aspx.cs" />
<Compile Include="SanKu\ReportLog.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\ReportLog.aspx.designer.cs" />
<Compile Include="SanKu\SafetyReward.aspx.cs" />
<Compile Include="SanKu\SafetyReward.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\SafetyReward.aspx.designer.cs" />
<Compile Include="SanKu\Training.aspx.cs" />
<Compile Include="SanKu\Training.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\Training.aspx.designer.cs" />
<Compile Include="SanKu\VioLation.aspx.cs" />
<Compile Include="SanKu\VioLation.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SanKu\VioLation.aspx.designer.cs" />
<Compile Include="SysManage\MasterOrg.aspx.cs" />
<Compile Include="SysManage\MasterOrg.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SysManage\MasterOrg.aspx.designer.cs" />
<Compile Include="SysManage\Schedule.aspx.cs">
<DependentUpon>Schedule.aspx</DependentUpon>
@@ -18634,7 +18668,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
SUBQHSE/FineUIPro.Web/SanKu/DangerousEngineering.aspx
+6
View File
@@ -80,6 +80,12 @@
<f:RenderField Width="160px" ColumnID="ENGINEERING_TYPE" DataField="ENGINEERING_TYPE"
FieldType="String" HeaderText="方案类型" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ENGINEERING_LEVEL" DataField="ENGINEERING_LEVEL"
FieldType="String" HeaderText="等级" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ENGINEERING_STATE" DataField="ENGINEERING_STATE"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="SUBCONTRACTOR_ID" DataField="SUBCONTRACTOR_ID" SortField="SUBCONTRACTOR_ID"
FieldType="String" HeaderText="主数据组织编码" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SUBQHSE/FineUIPro.Web/SanKu/DangerousEngineering.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.SanKu
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT tba.RECORD_ID,tba.DANGEROUS_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.ENGINEERING_DATE,tba.ENGINEERING_NAME,tba.ENGINEERING_TYPE,tba.ENGINEERING_ADDRESS,tba.STANDBY_PERSONNEL_NAME,tba.ReportDate
string strSql = @"SELECT tba.RECORD_ID,tba.DANGEROUS_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.ENGINEERING_DATE,tba.ENGINEERING_NAME,tba.ENGINEERING_TYPE,tba.ENGINEERING_LEVEL,tba.ENGINEERING_STATE,tba.ENGINEERING_ADDRESS,tba.STANDBY_PERSONNEL_NAME,tba.ReportDate
FROM SANKU_DANGEROUS_ENGINEERING AS tba WITH(NOLOCK)
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
SUBQHSE/FineUIPro.Web/SanKu/GridPatrol.aspx
+8 -2
View File
@@ -76,7 +76,7 @@
<f:RenderField Width="260px" ColumnID="PROJECT_NAME" DataField="PROJECT_NAME" SortField="PROJECT_NAME"
FieldType="String" HeaderText="主数据项目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="PERSONNEL_NAME" DataField="PERSONNEL_NAME"
<f:RenderField Width="120px" ColumnID="PERSONNEL_NAME" DataField="PERSONNEL_NAME"
FieldType="String" HeaderText="网格员" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="SUBCONTRACTOR_ID" DataField="SUBCONTRACTOR_ID" SortField="SUBCONTRACTOR_ID"
@@ -85,7 +85,13 @@
<f:RenderField Width="260px" ColumnID="SUBCONTRACTOR_NAME" DataField="SUBCONTRACTOR_NAME"
FieldType="String" HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PATROL_TIME" DataField="PATROL_TIME" SortField="PATROL_TIME"
<f:RenderField Width="200px" ColumnID="PATROL_WORKITEMS" DataField="PATROL_WORKITEMS"
FieldType="String" HeaderText="巡查事项" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PATROL_RECEIVEDATE" DataField="PATROL_RECEIVEDATE" SortField="PATROL_RECEIVEDATE"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="接收日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PATROL_TIME" DataField="PATROL_TIME" SortField="PATROL_TIME"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡查日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PATROL_STATUS" DataField="PATROL_STATUS"
SUBQHSE/FineUIPro.Web/SanKu/GridPatrol.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.SanKu
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT tba.RECORD_ID,tba.PATROL_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.PERSONNEL_ID_NUMBER,tba.PERSONNEL_NAME,tba.PATROL_TIME,tba.PATROL_STATUS,tba.ReportDate
string strSql = @"SELECT tba.RECORD_ID,tba.PATROL_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.PERSONNEL_ID_NUMBER,tba.PERSONNEL_NAME,tba.PATROL_WORKITEMS,tba.PATROL_RECEIVEDATE,tba.PATROL_TIME,tba.PATROL_STATUS,tba.ReportDate
FROM SANKU_GRID_PATROL AS tba WITH(NOLOCK)
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
SUBQHSE/FineUIPro.Web/SanKu/Hazard.aspx
+3
View File
@@ -120,6 +120,9 @@
<f:RenderField Width="100px" ColumnID="RECTIFICATION_STATUS" DataField="RECTIFICATION_STATUS"
FieldType="String" HeaderText="整改状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ECTIFICATION_COMPLETIONDATE" DataField="ECTIFICATION_COMPLETIONDATE" SortField="ECTIFICATION_COMPLETIONDATE"
FieldType="Date" Renderer="Date" HeaderText="完成日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RECTIFICATION_DEADLINE_ID" DataField="RECTIFICATION_DEADLINE_ID" SortField="RECTIFICATION_DEADLINE_ID"
FieldType="Date" Renderer="Date" HeaderText="整改期限" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
SUBQHSE/FineUIPro.Web/SanKu/Hazard.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.SanKu
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT tba.HAZARD_ID,tba.RECORD_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.RESPONSIBLE_PERSONNEL_NAME,tba.RECTIFIER_PERSONNEL_NAME,tba.DISCOVERY_DATE,tba.HAZARD_TYPE,tba.HAZARD_CONTENT,tba.HAZARD_LEVEL,tba.RECTIFICATION_STATUS,tba.RECTIFICATION_DEADLINE_ID,tba.ReportDate
string strSql = @"SELECT tba.HAZARD_ID,tba.RECORD_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.RESPONSIBLE_PERSONNEL_NAME,tba.RECTIFIER_PERSONNEL_NAME,tba.DISCOVERY_DATE,tba.HAZARD_TYPE,tba.HAZARD_CONTENT,tba.HAZARD_LEVEL,tba.RECTIFICATION_STATUS,tba.ECTIFICATION_COMPLETIONDATE,tba.RECTIFICATION_DEADLINE_ID,tba.ReportDate
FROM SANKU_HAZARD AS tba WITH(NOLOCK)
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
SUBQHSE/FineUIPro.Web/SanKu/VioLation.aspx
+4 -1
View File
@@ -99,7 +99,10 @@
<f:RenderField Width="120px" ColumnID="VIOLATION_DATE" DataField="VIOLATION_DATE" SortField="VIOLATION_DATE"
FieldType="Date" Renderer="Date" HeaderText="违章时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="VIOLATION_TYPE" DataField="VIOLATION_TYPE"
<f:RenderField Width="120px" ColumnID="VIOLATION_LEVEL" DataField="VIOLATION_LEVEL"
FieldType="String" HeaderText="违章级别" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="VIOLATION_TYPE" DataField="VIOLATION_TYPE"
FieldType="String" HeaderText="违章类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="VIOLATION_CONTENT" DataField="VIOLATION_CONTENT"
SUBQHSE/FineUIPro.Web/SanKu/VioLation.aspx.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using BLL;
using BLL;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.SanKu
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT tba.VIOLATION_ID,tba.RECORD_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.PERSONNEL_NAME,tba.VIOLATION_DATE,tba.VIOLATION_TYPE,tba.VIOLATION_CONTENT,tba.PENALTY_RESULT,tba.RECTIFICATION_STATUS,tba.ReportDate
string strSql = @"SELECT tba.VIOLATION_ID,tba.RECORD_ID,tba.PROJECT_CODE,tba.PROJECT_NAME,tba.SUBCONTRACTOR_ID,tba.SUBCONTRACTOR_NAME,tba.PERSONNEL_NAME,tba.VIOLATION_DATE,tba.VIOLATION_LEVEL,tba.VIOLATION_TYPE,tba.VIOLATION_CONTENT,tba.PENALTY_RESULT,tba.RECTIFICATION_STATUS,tba.ReportDate
FROM SANKU_VIOLATION AS tba WITH(NOLOCK)
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.SanKu
string rectificationStatus = this.drpRectificationStatus.SelectedValue.Trim();
if (!string.IsNullOrWhiteSpace(violationLevel))
{
strSql += " AND tba.VIOLATION_TYPE = @ViolationLevel";
strSql += " AND tba.VIOLATION_LEVEL = @ViolationLevel";
listStr.Add(new SqlParameter("@ViolationLevel", violationLevel));
}
if (!string.IsNullOrWhiteSpace(rectificationStatus))