安全巡检接入真实数据库:编码字段自动生成、公示牌二维码修复、安全问题统计排除作废
- 安全巡检表新增编码字段(Code,全局唯一 XJ-序号),WebAPI/桌面端新增时自动生成,不可重复 - 修复危大超危工程公示牌二维码不显示:urlName 含非法字符?导致 image.Save 抛异常,改用主键+内容哈希安全文件名 - 安全问题统计(mainProject/main3)排除作废数据(States=4),图表口径与顶部计数一致 - Word 导出文件名改为 监督巡视部位+编号 - Model.cs 由 SqlMetal 重新生成,补齐巡检人ID/签收人ID/发现问题/处理要求等字段;新增 HSSE_SafetyPatrol.Code.cs 补充 Code 列 - 新增安全巡检完整建表脚本(SGGLDB_V2026-08-25-001);删除已过时的接口文档 SafetyPatrol_API.md
This commit is contained in:
@@ -7,70 +7,160 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title>编辑安全巡检记录</title>
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
<style type="text/css">
|
||||
.patrol-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border: 1px solid #000;
|
||||
}
|
||||
.patrol-table td {
|
||||
border: 1px solid #000;
|
||||
padding: 6px 8px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.ptitle {
|
||||
text-align: center;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
padding: 10px;
|
||||
}
|
||||
.phead {
|
||||
background-color: #f2f2f2;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
}
|
||||
.plabel {
|
||||
white-space: nowrap;
|
||||
}
|
||||
.pcell {
|
||||
vertical-align: top;
|
||||
}
|
||||
.cfooter {
|
||||
text-align: center;
|
||||
}
|
||||
/* 让 TextArea 撑满所在单元格(FineUIPro 核心类为 .f-textbox,无 .f-textarea) */
|
||||
.patrol-table td.fillcell,
|
||||
.patrol-table td.fillcell > * {
|
||||
width: 100% !important;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.patrol-table td.fillcell textarea {
|
||||
width: 100% !important;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
/* 标签与输入框整组水平、垂直居中(其它、签收人、监督巡视人员) */
|
||||
.pair-center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-wrap: nowrap;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* 保证组内输入框不被压缩到下一行 */
|
||||
.pair-center > * {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
#ContentPanel1_txtProblems,#ContentPanel1_txtHandleRequire,#ContentPanel1_txtRectifyReview,#ContentPanel1_txtRemarks{
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
.textareaClass {
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
|
||||
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="危大、超危工程每日巡检记录" AutoScroll="true"
|
||||
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="ddlHazardProject" runat="server" Label="扫码工程" LabelAlign="Right"
|
||||
LabelWidth="100px" Required="true" ShowRedStar="true">
|
||||
</f:DropDownList>
|
||||
<f:DatePicker ID="dpPatrolDate" runat="server" Label="巡检日期" LabelAlign="Right"
|
||||
LabelWidth="90px" DateFormatString="yyyy-MM-dd">
|
||||
</f:DatePicker>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="ddlPatrolStatus" runat="server" Label="巡检状态" LabelAlign="Right"
|
||||
LabelWidth="100px">
|
||||
<f:ListItem Text="正常" Value="正常" />
|
||||
<f:ListItem Text="待整改" Value="待整改" />
|
||||
</f:DropDownList>
|
||||
<f:Label ID="lblPatrolMan" runat="server" Label="巡检人" LabelAlign="Right"
|
||||
LabelWidth="90px">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtContent" runat="server" Label="巡检内容" LabelAlign="Right" Height="100px"
|
||||
MaxLength="1000" LabelWidth="100px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
|
||||
<Items>
|
||||
<f:Label ID="Label1" runat="server" ShowRedStar="true" Label="巡检图片"
|
||||
LabelWidth="100px" LabelAlign="Right">
|
||||
</f:Label>
|
||||
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="ContentPanel1" runat="server" />
|
||||
<f:ContentPanel ID="ContentPanel1" ShowBorder="false" ShowHeader="false" BodyPadding="10px"
|
||||
AutoScroll="true" runat="server">
|
||||
<div id="patrolContent">
|
||||
<table class="patrol-table">
|
||||
<tr>
|
||||
<td colspan="2" class="ptitle">附件9 (危大工程类别)监督记录表</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<f:Form ID="FormHazard" ShowBorder="false" ShowHeader="false" BodyPadding="0" LabelAlign="Right" runat="server">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="ddlHazardProject" runat="server" Label="监督巡视部位" LabelWidth="110px" LabelAlign="Right" Required="true" Width="220px"></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</td>
|
||||
<td>
|
||||
<f:Form ID="FormDate" ShowBorder="false" ShowHeader="false" BodyPadding="0" LabelAlign="Right" runat="server">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DatePicker ID="dpPatrolDate" runat="server" Label="巡检日期" LabelWidth="80px" LabelAlign="Right" Width="140px" DateFormatString="yyyy-MM-dd"></f:DatePicker>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtCode" runat="server" Label="编码" LabelWidth="80px" LabelAlign="Right" Width="140px" Readonly="true"></f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="phead">监督巡视内容</td>
|
||||
<td class="phead">发现问题</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="pcell" style="height: 150px;">
|
||||
<div>1、施工条件保持情况</div>
|
||||
<div>2、按方案施工情况,实体与方案参数的对比</div>
|
||||
<div>3、现场安全防护状况</div>
|
||||
<div>4、作业人员持证上岗情况</div>
|
||||
<div class="pair-center">其它:<f:TextBox ID="txtContentOther" runat="server" Width="195px"></f:TextBox></div>
|
||||
</td>
|
||||
<td class="pcell fillcell">
|
||||
<f:TextArea ID="txtProblems" runat="server" CssStyle="height:100%;" ></f:TextArea>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="plabel">处理要求:</td>
|
||||
<td class="plabel"><div class="pair-center">签收人:<f:DropDownList ID="ddlReceiver" runat="server" Width="180px"></f:DropDownList></div></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="pcell fillcell">
|
||||
<f:TextArea ID="txtHandleRequire" runat="server" Height="90px"></f:TextArea>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="plabel">整改后复查情况:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="pcell fillcell">
|
||||
<f:TextArea ID="txtRectifyReview" runat="server" Height="90px"></f:TextArea>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="plabel">备注:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="pcell fillcell">
|
||||
<f:TextArea ID="txtRemarks" runat="server" Height="70px"></f:TextArea>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" class="cfooter"><div class="pair-center">监督巡视人员:<f:DropDownList ID="ddlPatrolMan" runat="server" Width="200px"></f:DropDownList></div></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div style="text-align:center; margin-top:10px;">
|
||||
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="上传巡视图片" runat="server" OnClick="btnAttach_Click"></f:Button>
|
||||
<f:Button ID="btnAttachRectify" Icon="TableCell" EnablePostBack="true" Text="上传整改图片" runat="server" OnClick="btnAttachRectify_Click"></f:Button>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" OnClick="btnSave_Click"></f:Button>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" OnClientClick="F.activeWindow.hide();"></f:Button>
|
||||
</div>
|
||||
</f:ContentPanel>
|
||||
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
|
||||
Height="500px">
|
||||
|
||||
Reference in New Issue
Block a user