lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

班前会

This commit is contained in:
夏菊 2026-02-28 16:09:10 +08:00
parent 470aac50f3
commit bcb1adf1c0
14 changed files with 293 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/DataShare/HSSE/APIMeetingSyncService.cs
View File

@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections; using System.Collections;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices.ComTypes;
namespace BLL namespace BLL
{ {
@ -160,6 +161,8 @@ namespace BLL
string result = string.Empty; string result = string.Empty;
if (data.Items.Count() > 0) if (data.Items.Count() > 0)
{ {
var jsonData = JsonConvert.SerializeObject(data);
ErrLogInfo.WriteLog($"【班前会接收数据】{jsonData}");
//1、判断分包单位是否存在 //1、判断分包单位是否存在
var unit = UnitService.getUnitByCollCropCodeUnitName(data.CollCropCode, data.UnitName); var unit = UnitService.getUnitByCollCropCodeUnitName(data.CollCropCode, data.UnitName);
if (unit == null) if (unit == null)
@ -243,6 +246,8 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
succ++; succ++;
//ErrLogInfo.WriteLog($"【班前会接收数据——内容附件】UnitDomain：{data.UnitDomain}；AttachFileId：{item.AttachFileId}；ToKeyId：{item.ToKeyId}；AttachSource：{item.AttachSource}；AttachUrl：{item.AttachUrl}");
//附件处理：内容附件 //附件处理：内容附件
BLL.FileInsertService.SaveAttachFileRecords(data.UnitDomain, item.AttachFileId, item.ToKeyId, item.AttachSource, item.AttachUrl); BLL.FileInsertService.SaveAttachFileRecords(data.UnitDomain, item.AttachFileId, item.ToKeyId, item.AttachSource, item.AttachUrl);
//附件处理：签到表 //附件处理：签到表

47
SGGL/BLL/OpenService/FileInsertService.cs
View File

@ -122,6 +122,49 @@ namespace BLL
/// <param name="attachUrl">附件路径</param> /// <param name="attachUrl">附件路径</param>
/// <returns></returns> /// <returns></returns>
public static void FileMoreInsert(List<byte[]> fileContextList, string attachUrl) public static void FileMoreInsert(List<byte[]> fileContextList, string attachUrl)
{
if (fileContextList.Count > 0)
{
string[] strs = attachUrl.Trim().Split(',');
int i = 0;
string physicalpath = ConfigurationManager.AppSettings["localRoot"];
foreach (var item in fileContextList)
{
//HttpContext.Current.Request.PhysicalApplicationPath;
string fullPath = (physicalpath + strs[i]).Replace('/', '\\');
if (!File.Exists(fullPath))
{
byte[] fileContext = item;
int index = fullPath.LastIndexOf("\\");
string filePath = fullPath.Substring(0, index);
if (!Directory.Exists(filePath))
{
Directory.CreateDirectory(filePath);
}
//string savePath = fullPath + fileName;
//文件读写模式
System.IO.FileMode fileMode = System.IO.FileMode.Create;
//写入文件
using (System.IO.FileStream fs = new System.IO.FileStream(fullPath, fileMode, System.IO.FileAccess.Write))
{
fs.Write(fileContext, 0, fileContext.Length);
}
}
i++;
}
}
}
/// <summary>
/// 获取多附件数据流类
/// </summary>
/// <param name="attachUrl">附件路径</param>
/// <returns></returns>
public static void FileMoreInsertOld(List<byte[]> fileContextList, string attachUrl)
{ {
if (fileContextList != null && fileContextList.Count() > 0) if (fileContextList != null && fileContextList.Count() > 0)
{ {
@ -223,12 +266,14 @@ namespace BLL
/// </summary> /// </summary>
public static void InsertAttachFilesRecord(string attachFileId, string dataId, string attachSource, string attachUrl, List<byte[]> fileContext) public static void InsertAttachFilesRecord(string attachFileId, string dataId, string attachSource, string attachUrl, List<byte[]> fileContext)
{ {
BLL.ErrLogInfo.WriteLog($"数据和附件插入到多附件表：1");
if (!string.IsNullOrEmpty(attachFileId)) if (!string.IsNullOrEmpty(attachFileId))
{ {
//多附件 //多附件
var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId); var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId);
if (attachFile == null) if (attachFile == null)
{ {
BLL.ErrLogInfo.WriteLog($"数据和附件插入到多附件表：2：attachFile == null");
////插入附件文件 ////插入附件文件
BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl); BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl);
@ -244,8 +289,10 @@ namespace BLL
} }
else else
{ {
BLL.ErrLogInfo.WriteLog($"数据和附件插入到多附件表：2：attachFile != null");
if (attachFile.AttachUrl != attachUrl) if (attachFile.AttachUrl != attachUrl)
{ {
BLL.ErrLogInfo.WriteLog($"数据和附件插入到多附件表：2：attachFile != null attachFile.AttachUrl != attachUrl");
/////删除附件文件 /////删除附件文件
//BLL.UploadAttachmentService.DeleteFile(ConfigurationManager.AppSettings["localRoot"], attachFile.AttachUrl); //BLL.UploadAttachmentService.DeleteFile(ConfigurationManager.AppSettings["localRoot"], attachFile.AttachUrl);
////插入附件文件 ////插入附件文件

22
SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialPro.aspx.cs
View File

@ -253,7 +253,7 @@ namespace FineUIPro.Web.HSSE.Check
return; return;
} }
string CheckSpecialId = Grid1.SelectedRowID.Split(',')[0]; string CheckSpecialId = Grid1.SelectedRowID.Split(',')[0];
var checkSpecial = BLL.Check_CheckSpecialService.GetCheckSpecialByCheckSpecialId(CheckSpecialId); var checkSpecial = BLL.Check_CheckSpecialProService.GetCheckSpecialByCheckSpecialId(CheckSpecialId);
if (checkSpecial != null) if (checkSpecial != null)
{ {
if (this.btnMenuModify.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面 if (this.btnMenuModify.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
@ -281,15 +281,13 @@ namespace FineUIPro.Web.HSSE.Check
foreach (int rowIndex in Grid1.SelectedRowIndexArray) foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{ {
string rowID = Grid1.DataKeys[rowIndex][0].ToString(); string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var checkSpecial = BLL.Check_CheckSpecialService.GetCheckSpecialByCheckSpecialId(rowID); var checkSpecial = BLL.Check_CheckSpecialProService.GetCheckSpecialByCheckSpecialId(rowID);
if (checkSpecial != null) if (checkSpecial != null)
{ {
BLL.LogService.AddSys_Log(this.CurrUser, checkSpecial.CheckSpecialCode, checkSpecial.CheckSpecialId, BLL.Const.ProjectCheckSpecialMenuId, BLL.Const.BtnDelete); BLL.LogService.AddSys_Log(this.CurrUser, checkSpecial.CheckSpecialCode, checkSpecial.CheckSpecialId, BLL.Const.ProjectCheckSpecialMenuId, BLL.Const.BtnDelete);
BLL.Check_CheckSpecialDetailService.DeleteCheckSpecialDetails(rowID); BLL.Check_CheckSpecialProDetailService.DeleteCheckSpecialDetails(rowID);
BLL.Check_CheckSpecialService.DeleteCheckSpecial(rowID);
} }
BLL.Check_CheckSpecialProService.DeleteCheckSpecial(rowID);
} }
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection); // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
BindGrid(); BindGrid();
@ -404,7 +402,7 @@ namespace FineUIPro.Web.HSSE.Check
string[] checkSpecialDetail = (Grid1.DataKeys[e.RowIndex][0].ToString()).Split(','); string[] checkSpecialDetail = (Grid1.DataKeys[e.RowIndex][0].ToString()).Split(',');
if (checkSpecialDetail.Count() > 1) if (checkSpecialDetail.Count() > 1)
{ {
var detail = Check_CheckSpecialDetailService.GetCheckSpecialDetailByCheckSpecialDetailId(checkSpecialDetail[1]); var detail = Check_CheckSpecialProDetailService.GetCheckSpecialDetailByCheckSpecialDetailId(checkSpecialDetail[1]);
if (detail != null) if (detail != null)
{ {
if (detail.DataType == "1") if (detail.DataType == "1")
@ -438,7 +436,7 @@ namespace FineUIPro.Web.HSSE.Check
// return; // return;
// } // }
// string Id = Grid1.SelectedRowID; // string Id = Grid1.SelectedRowID;
// var checkSpecial = BLL.Check_CheckSpecialService.GetCheckSpecialByCheckSpecialId(Id); // var checkSpecial = BLL.Check_CheckSpecialProService.GetCheckSpecialByCheckSpecialId(Id);
// string rootPath = Server.MapPath("~/"); // string rootPath = Server.MapPath("~/");
// string initTemplatePath = string.Empty; // string initTemplatePath = string.Empty;
// string uploadfilepath = string.Empty; // string uploadfilepath = string.Empty;
@ -636,17 +634,17 @@ namespace FineUIPro.Web.HSSE.Check
return; return;
} }
string CheckSpecialId = Grid1.SelectedRowID.Split(',')[0]; string CheckSpecialId = Grid1.SelectedRowID.Split(',')[0];
var checkSpecial = BLL.Check_CheckSpecialService.GetCheckSpecialByCheckSpecialId(CheckSpecialId); var checkSpecial = BLL.Check_CheckSpecialProService.GetCheckSpecialByCheckSpecialId(CheckSpecialId);
if (checkSpecial != null) if (checkSpecial != null)
{ {
var details = BLL.Check_CheckSpecialDetailService.GetCheckSpecialDetailByCheckSpecialId(CheckSpecialId); var details = BLL.Check_CheckSpecialProDetailService.GetCheckSpecialDetailByCheckSpecialId(CheckSpecialId);
foreach (var item in details) foreach (var item in details)
{ {
item.CompleteStatus = true; item.CompleteStatus = true;
BLL.Check_CheckSpecialDetailService.UpdateCheckSpecialDetail(item); BLL.Check_CheckSpecialProDetailService.UpdateCheckSpecialDetail(item);
} }
checkSpecial.States = Const.State_2; checkSpecial.States = Const.State_2;
Check_CheckSpecialService.UpdateCheckSpecial(checkSpecial); Check_CheckSpecialProService.UpdateCheckSpecial(checkSpecial);
var hazardRegisters = from x in Funs.DB.HSSE_Hazard_HazardRegister where x.CheckSpecialId == CheckSpecialId select x; var hazardRegisters = from x in Funs.DB.HSSE_Hazard_HazardRegister where x.CheckSpecialId == CheckSpecialId select x;
foreach (var item in hazardRegisters) foreach (var item in hazardRegisters)
{ {

2
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -83,7 +83,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
private void BindGrid() private void BindGrid()
{ {
//string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' "; //string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' ";
string strSql = "SELECT * FROM View_Hazard_HazardRegister "; string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE 1 = 1 ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{ {

5
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx
View File

@ -31,6 +31,11 @@
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
LabelAlign="right"> LabelAlign="right">
</f:TextBox> </f:TextBox>
<f:RadioButtonList runat="server" ID="rbSource" Width="220px" Label="来源" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
<f:RadioItem Text="全部" Value="0" Selected="true" />
<f:RadioItem Text="系统内单位" Value="1" />
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"

5
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
View File

@ -97,6 +97,11 @@ namespace FineUIPro.Web.HSSE.Meeting
sb.Append("AND ClassMeetingName LIKE @ClassMeetingName "); sb.Append("AND ClassMeetingName LIKE @ClassMeetingName ");
listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%")); listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%"));
} }
if (this.rbSource.SelectedValue == "1")
{
sb.Append("AND ClassMeeting.Remark LIKE @Remark ");
listStr.Add(new SqlParameter("@Remark", "%#%"));
}
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter); DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);

9
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.designer.cs generated
View File

@ -86,6 +86,15 @@ namespace FineUIPro.Web.HSSE.Meeting
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtClassMeetingName; protected global::FineUIPro.TextBox txtClassMeetingName;
/// <summary>
/// rbSource 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbSource;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>

4
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx
View File

@ -75,12 +75,12 @@
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button> </f:Button>
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1"> OnClick="btnAttachUrl1_Click" ValidateForms="SimpleForm1">
</f:Button> </f:Button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click" ValidateForms="SimpleForm1"> OnClick="btnAttachUrl2_Click" ValidateForms="SimpleForm1">
</f:Button>--%> </f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"

39
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.cs
View File

@ -129,6 +129,13 @@ namespace FineUIPro.Web.HSSE.Meeting
protected void btnSave_Click(object sender, EventArgs e) protected void btnSave_Click(object sender, EventArgs e)
{ {
this.SaveData(BLL.Const.BtnSave); this.SaveData(BLL.Const.BtnSave);
var porject = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{//项目关联了总包单位项目，保存成功后自动推送至总包单位
APIMeetingSyncService.PushClassMeetingLists(this.ProjectId, this.ClassMeetingId);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
} }
@ -215,23 +222,23 @@ namespace FineUIPro.Web.HSSE.Meeting
} }
#endregion #endregion
//protected void btnAttachUrl1_Click(object sender, EventArgs e) protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{ {
// if (string.IsNullOrEmpty(this.ClassMeetingId)) if (string.IsNullOrEmpty(this.ClassMeetingId))
// { {
// SaveData(Const.BtnSave); SaveData(Const.BtnSave);
// } }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//} }
//protected void btnAttachUrl2_Click(object sender, EventArgs e) protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{ {
// if (string.IsNullOrEmpty(this.ClassMeetingId)) if (string.IsNullOrEmpty(this.ClassMeetingId))
// { {
// SaveData(Const.BtnSave); SaveData(Const.BtnSave);
// } }
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//} }
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e) protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{ {

24
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Meeting { namespace FineUIPro.Web.HSSE.Meeting
{
public partial class ClassMeetingEdit { public partial class ClassMeetingEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -165,6 +167,24 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnAttachUrl; protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>

158
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx
View File

@ -12,85 +12,85 @@
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/> <f:pagemanager id="PageManager1" runat="server" autosizepanelid="SimpleForm1" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="班前会" AutoScroll="true" <f:form id="SimpleForm1" showborder="false" showheader="false" title="班前会" autoscroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> bodypadding="10px" runat="server" redstarposition="BeforeText" labelalign="Right">
<Rows> <rows>
<f:FormRow> <f:formrow>
<Items> <items>
<f:TextBox ID="txtClassMeetingCode" runat="server" Label="会议编号" LabelAlign="Right" <f:textbox id="txtClassMeetingCode" runat="server" label="会议编号" labelalign="Right"
Readonly="true"> readonly="true">
</f:TextBox> </f:textbox>
<f:TextBox ID="txtClassMeetingName" runat="server" Label="会议名称" LabelAlign="Right" <f:textbox id="txtClassMeetingName" runat="server" label="会议名称" labelalign="Right"
Readonly="true"> readonly="true">
</f:TextBox> </f:textbox>
</Items> </items>
</f:FormRow> </f:formrow>
<f:FormRow> <f:formrow>
<Items> <items>
<f:TextBox ID="txtClassMeetingDate" runat="server" Label="会议日期" LabelAlign="Right" <f:textbox id="txtClassMeetingDate" runat="server" label="会议日期" labelalign="Right"
Readonly="true"> readonly="true">
</f:TextBox> </f:textbox>
<f:TextBox ID="txtCompileManName" runat="server" Label="整理人" LabelAlign="Right" Readonly="true"> <f:textbox id="txtCompileManName" runat="server" label="整理人" labelalign="Right" readonly="true">
</f:TextBox> </f:textbox>
</Items> </items>
</f:FormRow> </f:formrow>
<f:FormRow> <f:formrow>
<Items> <items>
<f:TextBox ID="drpUnit" runat="server" Label="单位" LabelAlign="Right" Readonly="true"> <f:textbox id="drpUnit" runat="server" label="单位" labelalign="Right" readonly="true">
</f:TextBox> </f:textbox>
<f:TextBox ID="drpTeamGroup" runat="server" Label="班组" LabelAlign="Right" Readonly="true"> <f:textbox id="drpTeamGroup" runat="server" label="班组" labelalign="Right" readonly="true">
</f:TextBox> </f:textbox>
</Items> </items>
</f:FormRow> </f:formrow>
<f:FormRow> <f:formrow>
<Items> <items>
<f:TextBox runat="server" ID="txtAttentPersonNum" Label="人数" LabelAlign="Right" Readonly="true"></f:TextBox> <f:textbox runat="server" id="txtAttentPersonNum" label="人数" labelalign="Right" readonly="true"></f:textbox>
<f:Label runat="server" ID="lb1"></f:Label> <f:label runat="server" id="lb1"></f:label>
</Items> </items>
</f:FormRow> </f:formrow>
<f:FormRow> <f:formrow>
<Items> <items>
<f:HtmlEditor runat="server" Label="会议内容" ID="txtClassMeetingContents" ShowLabel="false" <f:htmleditor runat="server" label="会议内容" id="txtClassMeetingContents" showlabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="260" LabelAlign="Right"> editor="UMEditor" basepath="~/res/umeditor/" toolbarset="Full" height="260" labelalign="Right">
</f:HtmlEditor> </f:htmleditor>
</Items> </items>
</f:FormRow> </f:formrow>
<f:FormRow> <f:formrow>
<Items> <items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" <f:contentpanel id="ContentPanel1" runat="server" showheader="false" enablecollapse="true"
BodyPadding="0px"> bodypadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" /> <uc1:flowoperatecontrol id="ctlAuditFlow" runat="server" />
</f:ContentPanel> </f:contentpanel>
</Items> </items>
</f:FormRow> </f:formrow>
</Rows> </rows>
<Toolbars> <toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:toolbar id="Toolbar1" position="Bottom" toolbaralign="Right" runat="server">
<Items> <items>
<f:Label runat="server" ID="lbTemp"> <f:label runat="server" id="lbTemp">
</f:Label> </f:label>
<f:Button ID="btnAttachUrl" Text="内容" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:button id="btnAttachUrl" text="内容" tooltip="附件上传及查看" icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" > onclick="btnAttachUrl_Click">
</f:Button> </f:button>
<%-- <f:Button ID="btnAttachUrl1" Text="签到表" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:button id="btnAttachUrl1" text="签到表" tooltip="附件上传及查看" icon="TableCell" runat="server"
OnClick="btnAttachUrl1_Click" > onclick="btnAttachUrl1_Click">
</f:Button> </f:button>
<f:Button ID="btnAttachUrl2" Text="会议过程" ToolTip="附件上传及查看" Icon="TableCell" runat="server" <f:button id="btnAttachUrl2" text="会议过程" tooltip="附件上传及查看" icon="TableCell" runat="server"
OnClick="btnAttachUrl2_Click"> onclick="btnAttachUrl2_Click">
</f:Button>--%> </f:button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:toolbarfill id="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:toolbarfill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose"> <f:button id="btnClose" enablepostback="false" tooltip="关闭" runat="server" icon="SystemClose">
</f:Button> </f:button>
</Items> </items>
</f:Toolbar> </f:toolbar>
</Toolbars> </toolbars>
</f:Form> </f:form>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:window id="WindowAtt" title="附件" hidden="true" enableiframe="true" enablemaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" target="Parent" enableresize="false" runat="server" ismodal="true" width="700px"
Height="500px"> height="500px">
</f:Window> </f:window>
</form> </form>
</body> </body>
</html> </html>

16
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs
View File

@ -85,14 +85,14 @@ namespace FineUIPro.Web.HSSE.Meeting
} }
#endregion #endregion
//protected void btnAttachUrl1_Click(object sender, EventArgs e) protected void btnAttachUrl1_Click(object sender, EventArgs e)
//{ {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=1&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//} }
//protected void btnAttachUrl2_Click(object sender, EventArgs e) protected void btnAttachUrl2_Click(object sender, EventArgs e)
//{ {
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId))); PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ClassMeetingAttachUrl&menuId={1}&strParam=2&type=-1", this.ClassMeetingId, Const.ProjectClassMeetingMenuId)));
//} }
} }
} }

24
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Meeting { namespace FineUIPro.Web.HSSE.Meeting
{
public partial class ClassMeetingView { public partial class ClassMeetingView
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -165,6 +167,24 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnAttachUrl; protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnAttachUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl1;
/// <summary>
/// btnAttachUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl2;
/// <summary> /// <summary>
/// ToolbarFill1 控件。 /// ToolbarFill1 控件。
/// </summary> /// </summary>

18
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl> <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2026-02-28T01:47:26.7601751Z||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;</History> <History>True|2026-02-28T07:29:45.4981175Z||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>02/28/2026 09:47:24</publishTime> <publishTime>02/28/2026 15:29:42</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>02/28/2026 09:47:24</publishTime> <publishTime>02/28/2026 15:29:42</publishTime>
</File> </File>
<File Include="bin/Aspose.Words.dll"> <File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime> <publishTime>12/06/2024 20:13:58</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>02/28/2026 09:47:03</publishTime> <publishTime>02/28/2026 15:29:31</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime> <publishTime>12/26/2024 09:46:52</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>02/28/2026 09:47:03</publishTime> <publishTime>02/28/2026 15:29:31</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime> <publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime> <publishTime>02/09/2013 00:42:28</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>02/28/2026 09:47:04</publishTime> <publishTime>02/28/2026 15:29:32</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>02/28/2026 09:47:04</publishTime> <publishTime>02/28/2026 15:29:32</publishTime>
</File> </File>
<File Include="bin/WebAPI.xml"> <File Include="bin/WebAPI.xml">
<publishTime>02/28/2026 09:47:04</publishTime> <publishTime>02/28/2026 15:29:32</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime> <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>02/28/2026 09:47:05</publishTime> <publishTime>02/28/2026 15:29:33</publishTime>
</File> </File>
<File Include="Scripts/bootstrap.js"> <File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>