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

移动端检查修改

This commit is contained in:
geh 2025-09-16 10:56:03 +08:00
parent 19ea2f2363
commit bf9f9c44b5
10 changed files with 109 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DataBase/版本日志/SGGLDB_2025-09-16-geh.sql Normal file
View File

Binary file not shown.

1
SUBQHSE/BLL/Common/Const.cs
View File

@ -1291,6 +1291,7 @@ namespace BLL
/// 数据同步
/// </summary>
public const string Menu_SJTB = "Menu_SJTB";
public const string Menu_SJTB_P = "Menu_SJTB_P";
///// <summary>
///// 合同菜单
///// </summary>

17
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx
View File

@ -78,6 +78,11 @@
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px"
LabelWidth="80px">
</f:TextBox>
<f:DropDownList ID="drpProblemTypes" runat="server" Label="问题类别" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="80px" LabelAlign="Right" Width="170px">
<f:ListItem Text="安全" Value="1" Selected="True"/>
<f:ListItem Text="质量" Value="0"/>
</f:DropDownList>
</Items>
</f:Toolbar>
</Toolbars>
@ -160,12 +165,12 @@
</f:RenderField>
<f:TemplateField ColumnID="ProblemTypes" Width="120px" HeaderText="检查类型" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbProblemTypes" runat="server" Text='<%# ConvertProblemTypes(Eval("ProblemTypes")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:TemplateField ColumnID="ProblemTypes" Width="120px" HeaderText="检查类型" HeaderTextAlign="Center" --%>
<%-- TextAlign="Left"> --%>
<%-- <ItemTemplate> --%>
<%-- <asp:Label ID="lbProblemTypes" runat="server" Text='<%# ConvertProblemTypes(Eval("ProblemTypes")) %>'></asp:Label> --%>
<%-- </ItemTemplate> --%>
<%-- </f:TemplateField> --%>
<%-- <f:TemplateField ColumnID="CheckCycle" Width="120px" HeaderText="检查周期" HeaderTextAlign="Center" Hidden="true"
TextAlign="Left">
<ItemTemplate>

7
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs
View File

@ -114,8 +114,13 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
{
if (!string.IsNullOrEmpty(this.ProjectId) || !string.IsNullOrEmpty(this.UnintId))
{
string strSql = "SELECT * FROM View_Hazard_HazardRegister_Unit WHERE ProblemTypes ='1' ";
string strSql = "SELECT * FROM View_Hazard_HazardRegister_Unit WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProblemTypes.SelectedValue != BLL.Const._Null)
{
strSql += " AND ProblemTypes = @ProblemTypes";
listStr.Add(new SqlParameter("@ProblemTypes", this.drpProblemTypes.SelectedValue));
}
if (!string.IsNullOrEmpty(ProjectId))
{
strSql += " AND ProjectId = @ProjectId";

18
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs generated
View File

@ -131,6 +131,15 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.TextBox txtResponsibilityUnitName;
/// <summary>
/// drpProblemTypes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProblemTypes;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -275,15 +284,6 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// lbProblemTypes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbProblemTypes;
/// <summary>
/// lbImageUrl1 控件。
/// </summary>

13
SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
View File

@ -34,6 +34,19 @@ namespace FineUIPro.Web.HSSE.Check
{
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.panelLeftRegion.Hidden = true;
// this.Grid1.Columns[0].Hidden = true;
}
BindGrid();
}
}

5
SUBQHSE/FineUIPro.Web/indexProject.aspx
View File

@ -526,6 +526,11 @@
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite">
</f:Button>
</div>
<div :class="['nav', 'nav-r', navIdx==7?'nav-r-active':'']" @click="onSwitchMenu(7)">
<f:Button runat="server" CssClass="bgbtn" Text="数据管理" ID="btnServer" OnClick="btnServer_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
</div>
<div class="timer">

9
SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
View File

@ -673,6 +673,10 @@ namespace FineUIPro.Web
{
this.Tab1.IFrameUrl = "";
}
else if (type == Const.Menu_SJTB_P)
{
this.Tab1.IFrameUrl = "";
}
}
else
{
@ -725,7 +729,10 @@ namespace FineUIPro.Web
{
this.MenuSwitchMethod(Const.Menu_Device_P);
}
protected void btnServer_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_SJTB_P);
}
protected void btnHSSE_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_HSSE_P);

9
SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs generated
View File

@ -122,6 +122,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Button btnDigitalSite;
/// <summary>
/// btnServer 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnServer;
/// <summary>
/// drpProject 控件。
/// </summary>

85
SUBQHSE/WebAPI/Controllers/FileUploadController.cs
View File

@ -61,48 +61,57 @@ namespace WebAPI.Controllers
if (extensionstr==".jpg" || extensionstr == ".gif" || extensionstr == ".bmp" || extensionstr == ".png")
{
string TakePicDateTime = string.Empty;
System.Drawing.Image image = System.Drawing.Image.FromStream(file.InputStream, true, false);
Encoding ascii = Encoding.ASCII;
//遍历图像文件元数据，检索所有属性
foreach (System.Drawing.Imaging.PropertyItem p in image.PropertyItems)
//人员入场忽略签字时的时间水印
if (typeName != "PersonSign")
{
//如果是PropertyTagDateTime，则返回该属性所对应的值
if (p.Id == 0x0132)
string TakePicDateTime = string.Empty;
System.Drawing.Image image = System.Drawing.Image.FromStream(file.InputStream, true, false);
Encoding ascii = Encoding.ASCII;
//遍历图像文件元数据，检索所有属性
foreach (System.Drawing.Imaging.PropertyItem p in image.PropertyItems)
{
TakePicDateTime = ascii.GetString(p.Value);
}
}
TakePicDateTime = string.IsNullOrEmpty(TakePicDateTime) ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now) : TakePicDateTime;
if (!string.IsNullOrEmpty(TakePicDateTime))
{
////获取元数据中的拍照日期时间，以字符串形式保存
//TakePicDateTime = GetTakePicDateTime(pi);
//分析字符串分别保存拍照日期和时间的标准格式
var SpaceLocation = TakePicDateTime.IndexOf(" ");
var dt = TakePicDateTime.Substring(0, SpaceLocation);
dt = dt.Replace(":", "-");
var tm = TakePicDateTime.Substring(SpaceLocation + 1, TakePicDateTime.Length - SpaceLocation - 2);
TakePicDateTime = dt + " " + tm;
//由列表中的文件创建内存位图对象
var Pic = new Bitmap(rootUrl);
//由位图对象创建Graphics对象的实例
var g = Graphics.FromImage(Pic);
Font ft = new Font("宋体", 20, FontStyle.Regular, GraphicsUnit.Point, ((byte)(134)));//定义字体
//在Graphics表面绘制数码照片的日期/时间戳
g.DrawString(TakePicDateTime, ft, Brushes.Gold, 0, Pic.Height - 100);
// - 50);
string newRoot = localRoot + "newfile/";
if (!Directory.Exists(newRoot))
{
Directory.CreateDirectory(newRoot);
//如果是PropertyTagDateTime，则返回该属性所对应的值
if (p.Id == 0x0132)
{
TakePicDateTime = ascii.GetString(p.Value);
}
}
//将添加日期/时间戳后的图像进行保存
Pic.Save(newRoot + fileName);
fileName = "newfile/" + fileName;
//释放内存位图对象
Pic.Dispose();
TakePicDateTime = string.IsNullOrEmpty(TakePicDateTime)
? string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)
: TakePicDateTime;
if (!string.IsNullOrEmpty(TakePicDateTime))
{
////获取元数据中的拍照日期时间，以字符串形式保存
//TakePicDateTime = GetTakePicDateTime(pi);
//分析字符串分别保存拍照日期和时间的标准格式
var SpaceLocation = TakePicDateTime.IndexOf(" ");
var dt = TakePicDateTime.Substring(0, SpaceLocation);
dt = dt.Replace(":", "-");
var tm = TakePicDateTime.Substring(SpaceLocation + 1,
TakePicDateTime.Length - SpaceLocation - 2);
TakePicDateTime = dt + " " + tm;
//由列表中的文件创建内存位图对象
var Pic = new Bitmap(rootUrl);
//由位图对象创建Graphics对象的实例
var g = Graphics.FromImage(Pic);
Font ft = new Font("宋体", 20, FontStyle.Regular, GraphicsUnit.Point,
((byte)(134))); //定义字体
//在Graphics表面绘制数码照片的日期/时间戳
g.DrawString(TakePicDateTime, ft, Brushes.Gold, 0, Pic.Height - 100);
// - 50);
string newRoot = localRoot + "newfile/";
if (!Directory.Exists(newRoot))
{
Directory.CreateDirectory(newRoot);
}
//将添加日期/时间戳后的图像进行保存
Pic.Save(newRoot + fileName);
fileName = "newfile/" + fileName;
//释放内存位图对象
Pic.Dispose();
}
}
}