();
+ 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";
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
index 3c83303..732dfc2 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
@@ -131,6 +131,15 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
///
protected global::FineUIPro.TextBox txtResponsibilityUnitName;
+ ///
+ /// drpProblemTypes 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpProblemTypes;
+
///
/// Toolbar2 控件。
///
@@ -275,15 +284,6 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
///
protected global::System.Web.UI.WebControls.Label lblPageIndex;
- ///
- /// lbProblemTypes 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.WebControls.Label lbProblemTypes;
-
///
/// lbImageUrl1 控件。
///
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
index d68435b..e9749b7 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
@@ -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();
}
}
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx b/SUBQHSE/FineUIPro.Web/indexProject.aspx
index f12f2f6..42dc7c2 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx
@@ -526,6 +526,11 @@
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite">
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
index 5483f43..5927cb2 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
@@ -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);
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
index 57fc156..67323f0 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
@@ -122,6 +122,15 @@ namespace FineUIPro.Web
///
protected global::FineUIPro.Button btnDigitalSite;
+ ///
+ /// btnServer 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnServer;
+
///
/// drpProject 控件。
///
diff --git a/SUBQHSE/WebAPI/Controllers/FileUploadController.cs b/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
index 41bf601..4a3750a 100644
--- a/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
+++ b/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
@@ -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();
+ }
}
}