2023-09-21

SGGL/BLL/API/APICommonService.cs

@@ -89,7 +89,7 @@ namespace BLL
                     access_token,
                     touser = getUser.OpenId,
                     template_id = Const.WX_TemplateID,
-                    page = "pages/index/main",
+                    page = "pages/index/index",
                     data = new
                     {
                         thing3 = new { value = thing2 },

SGGL/BLL/Common/Const.cs

@@ -1042,7 +1042,7 @@ namespace BLL
         /// <summary>
         /// 项目信息
         /// </summary>
-        public const string ProjectSetMenuId = "0C3386D2-8F86-40AC-94F6-EE0100324FDD";
+        public const string ProjectSetMenuId = "6B988160-2F4D-4428-92D9-20392593B9D2";
         /// <summary>
         /// 项目主项
         /// </summary>
@@ -1621,7 +1621,6 @@ namespace BLL
 
         #region 项目菜单
 
-
         #region 安全体系
         /// <summary>
         /// 安全组织机构

SGGL/BLL/OpenService/MonitorService.cs

@@ -2205,7 +2205,7 @@ namespace BLL
                 AutoReset = true
             };
             getPipelineWeldingQuantities.Elapsed += new ElapsedEventHandler(AddPipelineWeldingQuantities);
-            getPipelineWeldingQuantities.Interval = 1000 * 3600 * 24;
+            getPipelineWeldingQuantities.Interval = 1000 * 3600 * 12;
             getPipelineWeldingQuantities.Start();
         }
 

SGGL/BLL/SysManage/UserService.cs

@@ -1569,6 +1569,7 @@ namespace BLL
         }
 
         public static void InitUserByRoleIdDropDownList(FineUIPro.DropDownList dropName, string projectId, string roleId, bool isShowPlease)
+
         {
             dropName.DataValueField = "UserId";
             dropName.DataTextField = "UserName";

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx

@@ -50,8 +50,8 @@
                              编辑施工质量月报
                         </td>
                         <td align="right" valign="middle" style="width: 50%; height: 30px;">
-                            <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click"
+                            <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" 
-                                ValidationGroup="Save" /><asp:ImageButton ID="btnPrint" runat="server" ImageUrl="~/Images/Print.gif" OnClick="btnPrint_Click" />
+                                ValidationGroup="Save" /><asp:ImageButton ID="btnPrint" runat="server" ImageUrl="~/Images/Print.gif" OnClick="btnPrint_Click"  />
                         </td>
                     </tr>
                 </table>
@@ -187,7 +187,7 @@
                     </tr>
                     <tr>
                         <td colspan="2">
-                            <asp:GridView ID="gvRowMaterialProblem" runat="server" AllowSorting="True" AutoGenerateColumns="False"
+                            <asp:GridView ID="gvRowMaterialProblem" runat="server" AllowSorting="True" AutoGenerateColumns="False" 
                                 HorizontalAlign="Justify" PageSize="12" Width="100%" OnRowCommand="gvRowMaterialProblem_RowCommand"
                                 >
                                 <Columns>
@@ -545,8 +545,8 @@
         </tr>
         <tr>
             <td>
-                <asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True"
+                <asp:GridView ID="gvNCRStatisc" runat="server" AllowPaging="false" AllowSorting="True"    
-                    AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated">
+                    AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvNCRStatisc_RowCreated" >
                     <AlternatingRowStyle CssClass="GridBgColr" />
                     <HeaderStyle CssClass="GridBgColr" />
                     <PagerStyle HorizontalAlign="Left" />

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
+using SgManager.AI;
 using AspNet = System.Web.UI.WebControls;
 namespace FineUIPro.Web.CQMS.ManageReport
 {
@@ -59,6 +60,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (!IsPostBack)
             {
+                this.EnableViewState=true;
                 this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
                 this.ReportId = Request.Params["reportId"];
                 if (!string.IsNullOrEmpty(Request.Params["view"]))
@@ -96,6 +98,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 {
                     this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
                     this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1));
+                    //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00");
+                    //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00");
                 }
                 CheckLotBindStatisc("CV");//检验批统计:土建
                 CheckLotBindStatisc("EQ");//检验批统计:设备
@@ -109,7 +113,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRBindStatisc();//NCR统计
                 DesignChangeOrderBindStatisc();//设计变更统计
                 PassWelderBindStatisc();//合格焊工统计
-            }
+            } 
         }
 
         /// <summary>
@@ -636,6 +640,34 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 }
                 StatisticsList.Add(StatisticsLast);
             }
+            else   //新增本周/月无验收数据的也需要列出表格
+            {
+
+                Model.CheckStatisc StatisticsLast = new Model.CheckStatisc();
+                StatisticsLast.Num = StatisticsList.Count() + 1;
+                StatisticsLast.WorkName = "合计";
+                StatisticsLast.CheckNum =0;
+                StatisticsLast.TotalCheckNum = 0;
+                StatisticsLast.OKNum = 0;
+                StatisticsLast.TotalOKNum = 0;
+                if (StatisticsLast.CheckNum != 0)//被除数不能为零
+                {
+                    StatisticsLast.OneOKRate = Math.Round((double)StatisticsLast.OKNum / (double)StatisticsLast.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
+                }
+                else
+                {
+                    StatisticsLast.OneOKRate = "0%";
+                }
+                if (StatisticsLast.TotalCheckNum != 0)//被除数不能为零
+                {
+                    StatisticsLast.TotalOneOKRate = Math.Round((double)StatisticsLast.TotalOKNum / (double)StatisticsLast.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
+                }
+                else
+                {
+                    StatisticsLast.TotalOneOKRate = "0%";
+                }
+                StatisticsList.Add(StatisticsLast);
+            }
 
             if (cNProfessionalCode == "CV")
             {
@@ -1274,5 +1306,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
             }
         }
         #endregion
+
+       
     }
 }

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReport.WeekReportEdit" %>
+<%@Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReport.WeekReportEdit" %>
 
 <!DOCTYPE html>
 
@@ -100,12 +100,12 @@
                         </td>
                         <td align="left" style="width: 90%">
                             <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
-                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="true"
+                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
                                 OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
                             —
                             <asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
-                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="true"
+                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})"  AutoPostBack="True"
-                                OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                 OnTextChanged="txtStartDate_TextChanged"  valueChanged="txtStartDate_TextChanged"  ></asp:TextBox>
                         </td>
                     </tr>
                 </table>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -159,6 +159,10 @@
                 <Items>
                     <f:CheckBox ID="ckIsUpTotalMonth" runat="server" Label="上报月总结" Checked="true" Hidden="true">
                     </f:CheckBox>
+                    <f:Button ID="btnAttachUrl" Text="鸟瞰图" ToolTip="项目鸟瞰图查看及上传" Icon="TableCell" runat="server"
+                              OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                    </f:Button>
+                    <f:Label runat="server" Text="请上传分辨率为330 * 240 且不大于300KB图片" CssClass="LabelColor"></f:Label>
                     <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1" 
                         OnClick="btnSave_Click">
                     </f:Button>
@@ -169,6 +173,11 @@
             </f:Toolbar>
         </toolbars>
     </f:Form>
+        
+        <f:Window ID="WindowAtt" Title="附件上传查看" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                  Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+                  Height="500px">
+        </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs

@@ -183,6 +183,11 @@ namespace FineUIPro.Web.ProjectData
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+        }
+
+        private void SaveData()
         {
             Base_Project project = new Base_Project
             {
@@ -209,20 +214,24 @@ namespace FineUIPro.Web.ProjectData
             {
                 project.JTProjectCode = project.ProjectCode;
             }
+
             //Country = this.txtCountry.Text.Trim(),
             /// Province = this.drpProvince.SelectedValue,
             if (this.drpCountry.SelectedValue != Const._Null)
             {
                 project.Country = this.drpCountry.SelectedValue;
             }
+
             if (this.drpProvince.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpProvince.SelectedValue))
             {
                 project.Province = this.drpProvince.SelectedValue;
             }
+
             if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))
             {
                 project.StartDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim());
             }
+
             if (!string.IsNullOrEmpty(txtEndDate.Text.Trim()))
             {
                 project.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text.Trim());
@@ -233,14 +242,17 @@ namespace FineUIPro.Web.ProjectData
             {
                 project.ProjectType = this.drpProjectType.SelectedValue;
             }
+
             if (this.drpUnit.SelectedValue != BLL.Const._Null)
             {
                 project.UnitId = this.drpUnit.SelectedValue;
             }
+
             if (this.drpProjectState2.SelectedValue != BLL.Const._Null)
             {
                 project.ProjectState2 = this.drpProjectState2.SelectedValue;
             }
+
             //project.PostCode = this.txtPostCode.Text.Trim();
             project.IsUpTotalMonth = Convert.ToBoolean(this.ckIsUpTotalMonth.Checked);
             project.IsForeign = Convert.ToBoolean(this.ckbIsForeign.Checked);
@@ -253,7 +265,8 @@ namespace FineUIPro.Web.ProjectData
 
                 // 初始化焊接环境变量设置
                 BLL.Project_SysSetService.InsertHjglInit(project.ProjectId);
-                LogService.AddSys_Log(this.CurrUser, project.ProjectCode, project.ProjectId, BLL.Const.ProjectSetMenuId, BLL.Const.BtnAdd);
+                LogService.AddSys_Log(this.CurrUser, project.ProjectCode, project.ProjectId, BLL.Const.ProjectSetMenuId,
+                    BLL.Const.BtnAdd);
             }
             else
             {
@@ -262,15 +275,17 @@ namespace FineUIPro.Web.ProjectData
                 {
                     project.FromProjectId = getProject.FromProjectId;
                 }
+
                 project.ProjectId = this.ProjectId;
                 ProjectService.UpdateProject(project);
-                LogService.AddSys_Log(this.CurrUser, project.ProjectCode, project.ProjectId, BLL.Const.ProjectSetMenuId, BLL.Const.BtnModify);
+                LogService.AddSys_Log(this.CurrUser, project.ProjectCode, project.ProjectId, BLL.Const.ProjectSetMenuId,
+                    BLL.Const.BtnModify);
             }
 
-            this.SetProjectManager(project.ProjectId);/// 设置项目、施工、安全经理
+            this.SetProjectManager(project.ProjectId); /// 设置项目、施工、安全经理
-            this.InsertDataTypeToProject(project.ProjectId);////初始化资料类别数据
+            this.InsertDataTypeToProject(project.ProjectId); ////初始化资料类别数据
-            this.InsertConstructionStandardListToProject(project.ProjectId);  ////初始化项目标准规范清单
+            this.InsertConstructionStandardListToProject(project.ProjectId); ////初始化项目标准规范清单
-            this.InsertITPListProject(project.ProjectId);   // 初始化ITP列表
+            this.InsertITPListProject(project.ProjectId); // 初始化ITP列表
             //this.InsertAC(project);  //初始化防腐绝热
             //this.InsertGE(project);  //初始化地勘
             //this.InsertUP(project);  //初始化全厂地下主管网
@@ -1648,5 +1663,14 @@ namespace FineUIPro.Web.ProjectData
             this.drpProvince.Items.Clear();
             CityService.InitCityDropDownList(this.drpProvince, this.drpCountry.SelectedValue, true);
         }
+
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(ProjectId))
+            {
+                SaveData();
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProjectAttachUrl&menuId={1}", this.ProjectId, BLL.Const.ProjectSetMenuId)));
+        }
     }
 }

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
-    
+{
-    
+
-    public partial class ProjectSetSave {
+
-        
+    public partial class ProjectSetSave
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-        
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-        
+
         /// <summary>
         /// drpProjectType 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectType;
-        
+
         /// <summary>
         /// drpProjectState 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState;
-        
+
         /// <summary>
         /// drpProjectState2 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState2;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// txtContractNo 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractNo;
-        
+
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDuration;
-        
+
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-        
+
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-        
+
         /// <summary>
         /// drpQAManager 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQAManager;
-        
+
         /// <summary>
         /// drpHSSEManager 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHSSEManager;
-        
+
         /// <summary>
         /// drpDriveManager 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDriveManager;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-        
+
         /// <summary>
         /// txtJTProjectCode 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtJTProjectCode;
-        
+
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-        
+
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProjectMoney;
-        
+
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtConstructionMoney;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// drpCountry 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCountry;
-        
+
         /// <summary>
         /// drpProvince 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvince;
-        
+
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-        
+
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-        
+
         /// <summary>
         /// bottomPanel 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel bottomPanel;
-        
+
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-        
+
         /// <summary>
         /// txtHJProjectCode 控件。
         /// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHJProjectCode;
-        
+
         /// <summary>
         /// txtKZProjectCode 控件。
         /// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtKZProjectCode;
-        
+
         /// <summary>
         /// txtProgress 控件。
         /// </summary>
@@ -335,7 +337,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProgress;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -344,7 +346,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ckIsUpTotalMonth 控件。
         /// </summary>
@@ -353,7 +355,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
-        
+
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -362,7 +373,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -371,7 +382,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>
@@ -380,5 +391,14 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCompileMan;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
     }
 }

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -61,17 +61,17 @@
                         <div class="y_row y_rgss">
                             <div class="y_rgs y_column y_image_default">
                                 <p class="y_rgs_val" id="divSafeWorkTime" runat="server">0000000000</p>
-                                <div class="y_rgs_label">累计安全人工时</label>
+                                <div class="y_rgs_label">累计安全人工时
                                 </div>
                             </div>
                             <div class="y_rgs y_column y_image_default">
                                 <p class="y_rgs_val" id="divSafeWorkTimeMonth" runat="server">0000000000</p>
-                                <div class="y_rgs_label">本月安全人工时</label>
+                                <div class="y_rgs_label">本月安全人工时
                                 </div>
                             </div>
                             <div class="y_rgs y_column y_image_default">
                                 <p class="y_rgs_val"  id="divSafePersonNum" runat="server">0</p>
-                                <div class="y_rgs_label">安全培训累计人员</label>
+                                <div class="y_rgs_label">安全培训累计人员
                                 </div>
                             </div>
                         </div>
@@ -204,22 +204,23 @@
             </div>
             <div class="site y_column" style="justify-content: space-between;">
                 <div class="y_box" style="width: 100%;">
-                    <div class="y_box_label y_image_default">工程概括</div>
+                    <div class="y_box_label y_image_default">工程概况</div>
                     <div class="y_box_main y_row" style="justify-content: space-between;padding: .1875rem .25rem;">
                         <div class="gk-box" style="width: 2.75rem;">
                             <div class="row"><span>工程名称：</span><%=spanProjectName %></div>
-                            <div class="row"><span>建设单位：</span>  <%=spanOwnUnit %></div>
+                            <div class="row"><span>建设单位：</span><%=spanOwnUnit %></div>
-                            <div class="row"><span>施工单位：</span> <%=spanSGUnit %></div>
+                            <div class="row"><span>施工单位：</span><%=spanSGUnit %></div>
                             <div class="row"><span>监理单位：</span><%=spanJLUnit %></div>
-                            <div class="row"><span>工程概况：</span><span></span></div>
+                            <div class="row"><span>工程概况：</span><%=spanRemark %></div>
                         </div>
                         <div class="gk-box" style="width: 3.55rem;">
                             <div class="swiper">
                                 <div class="swiper-wrapper">
+                                    <%=divProjectImg %>
+                                    <%--<div class="swiper-slide"><img src="./imags/16.png"></div>
                                     <div class="swiper-slide"><img src="./imags/16.png"></div>
                                     <div class="swiper-slide"><img src="./imags/16.png"></div>
-                                    <div class="swiper-slide"><img src="./imags/16.png"></div>
+                                    <div class="swiper-slide"><img src="./imags/16.png"></div>--%>
-                                    <div class="swiper-slide"><img src="./imags/16.png"></div>
                                 </div>
                                 <!-- 如果需要分页器 -->
                                 <div class="swiper-pagination"></div>

SGGL/FineUIPro.Web/common/mainProject2.aspx.cs

@@ -227,7 +227,7 @@ namespace FineUIPro.Web.common
             divOwnUnitTitle = "";
             divSGUnitTitle = "";
             divJLUnitTitle = "";
-            divProjectImg = "../res/indexv2/assets/image/index6/center-bg.jpeg";
+            divProjectImg = "<div class=\"swiper-slide\"><img src=\"./imags/16.png\"></div>";
             var project = ProjectService.GetProjectByProjectId(this.ProjectId);
             if (project != null)
             {
@@ -292,12 +292,34 @@ namespace FineUIPro.Web.common
                         }
                     }
                 }
-
+                var allowExtensions = new List<string>
+                {
+                   
+                    "jpg", "jpeg", "png", "bmp", "gif", // 图片文件类型
+                   
+                };
                 var getImag = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == project.ProjectId);
                 if (getImag != null && !string.IsNullOrEmpty(getImag.AttachUrl))
                 {
                     string url = getImag.AttachUrl.Replace('\\', '/');
-                    string firtstUrl = Funs.GetStrListByStr(url, ',').FirstOrDefault();
+                    var UrlList = Funs.GetStrListByStr(url, ',');
+                    foreach (var item in UrlList)
+                    {
+                        if (!string.IsNullOrEmpty(item))
+                        {
+                            string atturl = Funs.RootPath + item.Replace(';', ' ').Trim();
+                            string fileType = GetFileType(atturl);
+
+                            if (File.Exists(atturl) && allowExtensions.Contains(fileType))
+                            {
+
+                                 divProjectImg += string.Format(" <div class=\"swiper-slide\"><img src=\"{0}\"></div>", atturl.Replace(Funs.RootPath,"/"));
+
+                                //this.divProjectImgs.Src = divProjectImg;
+                            }
+                        }
+                    }
+                    /*string firtstUrl = Funs.GetStrListByStr(url, ',').FirstOrDefault();
                     if (!string.IsNullOrEmpty(firtstUrl))
                     {
                         string atturl = Funs.RootPath + firtstUrl.Replace(';', ' ').Trim();
@@ -306,11 +328,21 @@ namespace FineUIPro.Web.common
                             divProjectImg = "../" + firtstUrl.Replace(';', ' ').Trim();
                             //this.divProjectImgs.Src = divProjectImg;
                         }
-                    }
+                    }*/
                 }
             }
         }
+        private string GetFileType(string fileName)
+        {
+            string fileType = String.Empty;
+            int lastDotIndex = fileName.LastIndexOf(".");
+            if (lastDotIndex >= 0)
+            {
+                fileType = fileName.Substring(lastDotIndex + 1).ToLower();
+            }
 
+            return fileType;
+        }
         #endregion
 
         #region 风险预警

SGGL/FineUIPro.Web/common/main_new0.aspx

@@ -8,6 +8,7 @@
     <title>安全生产</title>
     <script src="lib/flex.js"></script>
     <link rel="stylesheet" href="css/safetyproduction.css"/>
+    <link rel="stylesheet" href="../res/assets/css/xfk.css"/>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -18,7 +19,7 @@
                     <div class="y_box_label y_image_default">安监人员数据</div>
                     <div class="y_box_main">
                         <div class="y_rs_row y_row" style="margin-top: .25rem;">
-                            <div class="y_rs_item y_column">
+                            <div class="y_rs_item y_column js-hover "  data-type="HeadOfficeNum">
                                 <div class="y_rs_item_label">企业总部人数</div>
                                 <div class="y_rs_item_value y_row">
                                     <div class="y_rs_box y_column">
@@ -31,7 +32,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="y_rs_item y_column">
+                            <div class="y_rs_item y_column js-hover" data-type="Branch">
                                 <div class="y_rs_item_label">分支机构</div>
                                 <div class="y_rs_item_value y_row">
                                     <div class="y_rs_box y_column">
@@ -47,8 +48,8 @@
                         </div>
 
                         <div class="y_rs_row y_row" style="margin-top: .125rem;">
-                            <div class="y_rs_item y_column" style="width: 3.75rem;">
+                            <div class="y_rs_item y_column js-hover" style="width: 3.75rem;" data-type="ProjectNum">
-                                <div class="y_rs_item_label">企业总部人数</div>
+                                <div class="y_rs_item_label">项目人数</div>
                                 <div class="y_rs_item_value img2 y_row">
                                     <div class="y_rs_box y_column">
                                         <div class="y_rs_number" id="div_qyzbrs1" runat="server">0</div>
@@ -64,7 +65,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="y_rs_item y_column" style="width: 1.625rem;">
+                            <div class="y_rs_item y_column js-hover" style="width: 1.625rem;" data-type="SafetyInjectionEngineer">
                                 <div class="y_rs_item_label">注安师</div>
                                 <div class="y_rs_item_value y_row" style="background-image: none;">
                                     <div class="y_rs_box y_column">
@@ -76,7 +77,7 @@
                         </div>
 
                         <div class="y_rs_row y_row" style="margin-top: .125rem;">
-                            <div class="y_rs_item y_column" style="width: 100%;">
+                            <div class="y_rs_item y_column js-hover" style="width: 100%;">
                                 <div class="y_rs_item_label">项目人数</div>
                                 <div class="y_rs_item_value img2 y_row">
                                     <div class="y_rs_box y_column">
@@ -97,7 +98,7 @@
                     </div>
                 </div>
                 <!-- 安全会议数据 -->
-                <div class="y_box" style="height: 2.975rem;margin-top: .25rem;">
+                <div class="y_box js-hover" style="height: 2.975rem;margin-top: .25rem;"  data-type="SafetyMeetingData">
                     <div class="y_box_label y_image_default">安全会议数据</div>
                     <div class="y_box_main" style="padding: .25rem;">
                         <div class="anj y_image_default">
@@ -132,19 +133,19 @@
             </div>
             <div class="site">
                 <div class="y_top_boxs y_row">
-                    <div class="y_top_box y_image_default y_row">
+                    <div class="y_top_box y_image_default y_row js-hover" data-type="BeUnderConstructionNum">
                         <div class="y_top_box_label" style="color: #12CDA2;">在建项目</div>
                         <div class="y_top_box_value" style="color: #12CDA2;" id="div_zjxm" runat="server">0</div>
                     </div>
-                    <div class="y_top_box y_image_default y_row">
+                    <div class="y_top_box y_image_default y_row js-hover" data-type="ShutdownNum">
                         <div class="y_top_box_label" style="color: #00FFFF;">停工项目</div>
                         <div class="y_top_box_value" style="color: #00FFFF;" runat="server" id="div_tgxm">0</div>
                     </div>
-                    <div class="y_top_box y_image_default y_row">
+                    <div class="y_top_box y_image_default y_row js-hover"  data-type="MajorProjectsUnderConstructionNum">
                         <div class="y_top_box_label" style="color: #FF7474;">在施危大工程</div>
                         <div class="y_top_box_value" style="color: #FF7474;" runat="server" id="div_wdxm">0</div>
                     </div>
-                    <div class="y_top_box y_image_default y_row">
+                    <div class="y_top_box y_image_default y_row js-hover"   data-type="WorkingHourData">
                         <div class="y_top_box_label" style="color: #00FFFF;">安全工时</div>
                         <div class="y_top_box_value" style="color: #00FFFF;" runat="server" id="div_safeworktime">0</div>
                     </div>
@@ -182,7 +183,7 @@
             </div>
             <div class="site y_column">
                 <div class="y_box1 y_row">
-                    <div class="item">
+                    <div class="item js-hover" data-type="SafeCost">
                         <div class="item-label">安全费用数据</div>
                         <div class="item_card y_column">
                             <div class="item_card-label">费用提取（万元）</div>
@@ -193,7 +194,7 @@
                             <div class="item_card-value"><%=GetCostUse() %></div>
                         </div>
                     </div>
-                    <div class="item">
+                    <div class="item js-hover" data-type="ConstructionEquipment">
                         <div class="item-label">施工机具设备数据</div>
                         <div class="item_card y_column">
                             <div class="item_card-label">在用</div>
@@ -204,7 +205,7 @@
                             <div class="item_card-value"><%=GetSpecialEquipmentNum() %></div>
                         </div>
                     </div>
-                    <div class="item">
+                    <div class="item js-hover" data-type="HighRiskWorkPermit">
                         <div class="item-label">高风险作业许可数据</div>
                         <div class="item_card y_column">
                             <div class="item_card-label">许可项</div>
@@ -217,14 +218,14 @@
                     </div>
                 </div>
                 <div class="y_box" style="width: 6rem;height: 5.0875rem;">
-                    <div class="y_box_label y_image_default">隐患排查治理数据
+                    <div class="y_box_label y_image_default tab-wrap">隐患排查治理数据
                         <div class="y_tabs y_row">
-                            <span class="y_image_default y_tab-action" style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">一般隐患</span>
+                            <span class="y_image_default y_tab-action " data-type="yb" style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">一般隐患</span>
-                            <span class="y_image_default"  style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
+                            <span class="y_image_default" data-type="zd" style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
                         </div>
                     </div>
                     <div class="y_box_main">
-                        <div class="pc_box y_row" style="padding-top: .25rem;">
+                        <div class="pc_box y_row js-hover" data-type="yhpc"style="padding-top: .25rem;">
                             <div class="pc-item">
                                 <div class="pc-item-card y_column y_image_default">
                                     <div class="pc-item-card_label">整改闭环项</div>
@@ -247,12 +248,12 @@
         </div>
 
         <div class="body1 y_row">
-            <div class="card1 ">
+            <div class="card1 js-hover" data-type="SafetySupervisionAndInspectionData">
-                <div class="card1_title y_image_default">安全监督检查数据</div>
+                <div class="card1_title y_image_default js-hover" data-type="SafetySupervisionAndInspectionData">安全监督检查数据</div>
                 <div class="card1-body" id="jcsjmap"></div>
             </div>
-            <div class="card1 ">
+            <div class="card1 js-hover" data-type="AccidentEventData">
-                <div class="card1_title y_image_default">事故事件数据
+                <div class="card1_title y_image_default  js-hover" data-type="AccidentEventData">事故事件数据
                    <%-- <div class="y_tabs y_row">
                         <span class="y_image_default y_tab-action">企业级</span>
                         <span class="y_image_default">项目级</span>
@@ -274,7 +275,7 @@
             </div>
             <div class="card1 ">
                 <div class="card1_title y_image_default">应急管理数据</div>
-                <div class="card1-body yj-body y_image_default">
+                <div class="card1-body yj-body y_image_default js-hover" data-type="yjglsj" >
                     <div class="y_column">
                         <div class="yj-number"><%=GetCompanyComprehensivePlanNum() %></div>
                         <div class="yj-label">综合预案</div>
@@ -295,7 +296,7 @@
             </div>
             <div class="card1 ">
                 <div class="card1_title y_image_default">安全教育培训人次数数据</div>
-                <div class="card1-body y_column aqjy">
+                <div class="card1-body y_column aqjy  js-hover" data-type="SafeTrainData">
                     <div class="y_column">
                         <div class="aqjy-label">三级安全教育培训</div>
                         <div class="aqjy-value"><%=GetSafeTrainNum() %></div>
@@ -316,13 +317,13 @@
             </div>
             <div class="card1 ">
                 <div class="card1_title y_image_default">应急管理数据
-                    <div class="y_tabs y_row">
+                    <div class="y_tabs y_row ">
-                        <span class="y_image_default y_tab-action" id="span_wdgc" onclick="yjglOnclick(0)" style="cursor:pointer">危大工程</span>
+                        <span class="y_image_default y_tab-action" id="span_wdgc" onclick="yjglOnclick(0)" style="cursor:pointer" >危大工程</span>
                         <span class="y_image_default" id="span_cwdgc" onclick="yjglOnclick(1)" style="cursor:pointer">超危大工程</span>
                     </div>
                 </div>
                 <div class="card1-body" style="    padding: .25rem .125rem;">
-                    <div class="yj-box y_image_default">
+                    <div class="yj-box y_image_default js-hover" data-type="wdgcsj"  >
                         <div style="padding: .1875rem 0 0 .1875rem;">
                             <div class="yj-box_label">审批完成</div>
                             <div class="yj-box_number" id="div_spwc"><%=GetCompletedNum() %></div>
@@ -343,19 +344,184 @@
                 </div>
             </div>
         </div>
+    <div class="click-wrap" >
+        <div class="click-close"></div>
+        <div class="click-item">
+            <%--        <iframe  src="../SysManage/Unit.aspx"   width="100%" height="450"></iframe>--%>
+            <iframe src="" id="iframe" width="100%" height="450"></iframe>
+        </div>
+    </div>
     </form>
 </body>
 </html>
 <script src="lib/echarts.min.js"></script>
 <script src="lib/jquery.js"></script>
+<script src="../res/assets/js/jquery.mousewheel.min.js"></script>
 <script>
     $(function () {
         //一般隐患
         zgmap(<%=GetGeneralZgl()%>)
         zgbarmap(0)
+        initClick();
     })
     
-    
+    function GetClickHtml(obj) {
+        var $this = $(obj), type = $this.attr('data-type'), tabType = $this.attr('data-tabType') || '';
+        var title = '';
+        if (tabType != '') {
+            tabType = $this.closest('.bb-item').find('.tab-wrap .tab .active').attr('data-type')
+            if (tabType == null) {
+                tabType = $this.closest('.str-bottom').find('.tab-wrap .tab .active').attr('data-type')
+            }
+        }
+        console.log(type)
+        if (type == 'HeadOfficeNum') {
+            $('iframe').attr('src', '../DataShow/CompanyPerson.aspx') //企业总部
+            window.open("../DataShow/CompanyPerson.aspx")
+        }
+        else if (type == 'Branch') {
+            $('iframe').attr('src', '../DataShow/CompanyPerson.aspx') //分支机构
+            window.open("../DataShow/CompanyPerson.aspx")
+        }
+        else if (type == 'ProjectNum') {
+            $('iframe').attr('src', '../DataShow/ProjectPerson.aspx')//项目人员
+            window.open("../DataShow/ProjectPerson.aspx")
+
+        }
+        else if (type == 'SafetyInjectionEngineer') {
+            $('iframe').attr('src', '../DataShow/ProjectPerson.aspx')//项目人员
+            window.open("../DataShow/ProjectPerson.aspx")
+
+        }
+        else if (type == 'Certificate') {
+            $('iframe').attr('src', '../DataShow/ProjectPerson.aspx') //项目人员
+            window.open("../DataShow/ProjectPerson.aspx")
+
+        }
+        else if (type == 'SafetyMeetingData') {
+            $('iframe').attr('src', '../DataShow/Meeting.aspx') //安全会议数据
+            window.open("../DataShow/Meeting.aspx")
+
+        }
+        else if (type == 'BeUnderConstructionNum') {
+            $('iframe').attr('src', '../DataShow/Project.aspx') //项目信息  
+            window.open("../DataShow/Project.aspx")
+
+        }
+        else if (type == 'ShutdownNum') {
+            $('iframe').attr('src', '../DataShow/Project.aspx') //项目信息 
+            window.open("../DataShow/Project.aspx")
+
+        }
+        else if (type == 'JoinConstructionPersonNum') {
+            $('iframe').attr('src', '../DataShow/Project.aspx') //项目信息    
+            window.open("../DataShow/Project.aspx")
+
+        }
+        else if (type == 'MajorProjectsUnderConstructionNum') {
+            $('iframe').attr('src', '../DataShow/Project.aspx') //项目信息 
+            window.open("../DataShow/Project.aspx")
+
+        }
+        else if (type == 'WorkingHourData') {
+            $('iframe').attr('src', '../DataShow/WorkingHours.aspx') //工时数据   
+            window.open("../DataShow/WorkingHours.aspx")
+
+        }
+        else if (type == 'SafeTrainData') {
+            $('iframe').attr('src', '../DataShow/EduTrain.aspx') //安全教育培训     
+            window.open("../DataShow/EduTrain.aspx")
+
+        }
+        else if (type == 'EnvironmentalData') {
+            $('iframe').attr('src', '../DataShow/Environmental.aspx') //环保数据  
+            window.open("../DataShow/Environmental.aspx")
+
+        }
+        else if (type == 'SafeCost') {
+            $('iframe').attr('src', '../DataShow/SecurityCost.aspx') //安全费用 
+            window.open("../DataShow/SecurityCost.aspx")
+
+        }
+        else if (type == 'ConstructionEquipment') {
+            $('iframe').attr('src', '../DataShow/ConstructionEquipment.aspx') //施工机具设备 
+            window.open("../DataShow/ConstructionEquipment.aspx")
+
+
+        }
+        else if (type == 'HighRiskWorkPermit') {
+            $('iframe').attr('src', '../DataShow/License.aspx') //高风险作业许可
+            window.open("../DataShow/License.aspx")
+
+        }
+        else if (type == 'SafetySupervisionAndInspectionData') {
+            $('iframe').attr('src', '../DataShow/Check.aspx') //安全监督检查
+            window.open("../DataShow/Check.aspx")
+
+        }
+        else if (type == 'AccidentEventData') {
+            $('iframe').attr('src', '../DataShow/Accident.aspx') //事故事件数据
+            window.open("../DataShow/Accident.aspx")
+
+        }
+        else if (type == 'SafeRiskData') {
+            $('iframe').attr('src', '../DataShow/SecurityRisk.aspx') //安全风险数据
+            window.open("../DataShow/SecurityRisk.aspx")
+
+        }
+        else if (type == 'yjglsj'<%-- && tabType == "qyj"--%>) {
+            $('iframe').attr('src', '../DataShow/Emergency.aspx')//应急管理数据-企业级
+            window.open("../DataShow/Emergency.aspx")
+
+        }<%--
+        else if (type == 'yjglsj' && tabType == "xmj") {
+            $('iframe').attr('src', '../DataShow/Emergency.aspx')//应急管理数据-项目级
+            window.open("../DataShow/Emergency.aspx")
+
+        }--%>
+        else if (type == 'wdgcsj'<%-- && tabType == "large"--%>) {
+            $('iframe').attr('src', '../DataShow/LargeEngineering.aspx')//危大工程- 危大工程
+            window.open("../DataShow/LargeEngineering.aspx")
+
+        }<%--
+        else if (type == 'wdgcsj' && tabType == "super") {
+            $('iframe').attr('src', '../DataShow/LargeEngineering.aspx') // 危大工程 - 超危大工程
+            window.open("../DataShow/LargeEngineering.aspx")
+            --%>
+
+        }
+        else if (type == 'yhpc' && tabType == "yb") {
+            $('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
+            window.open("../DataShow/HiddenRectification.aspx")
+
+        }
+        else if (type == 'yhpc' && tabType == "zd") {
+            $('iframe').attr('src', '../DataShow/HiddenRectification.aspx')//隐患排查-重大隐患
+            window.open("../DataShow/HiddenRectification.aspx")
+
+        }/*
+     else if (type == 'Video') {
+         $('iframe').attr('src', '../InterfacePopup/HSSE/VideoView.aspx') //视频监控
+     }*/
+        else {
+            // $('iframe').attr('src', '../SysManage/Unit.aspx')
+            //  window.open("../DataShow/Unit.aspx")
+            console.log("通用")
+        }
+    }
+
+    function initClick() {
+        // 设置iframe高度
+        $('.click-wrap .click-item iframe').height($('.click-wrap').height())
+        $(".js-hover").click(function () {
+            var htmlContent = GetClickHtml(this)
+            // $('.click-wrap').show()
+            // $(".hover-wrap").hide()
+        })
+        $('.click-close').click(function () {
+            $('.click-wrap').hide()
+        })
+    }
     //点击隐患排查治理数据
     function yjClick(objval) {
         console.log(objval)

SGGL/FineUIPro.Web/indexProject.aspx

@@ -256,7 +256,7 @@
                                                     EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnProjectSet" OnClientClick="parent.removeActiveTab();">
                                                 </f:Button>
                                     </div>
-                                    <%--<div class="y_set y_image_default help">帮助</div>--%>
+                                  <%--  <div class="y_set y_image_default help">帮助</div>--%>
                                     <div class="y_set y_image_default exit" onclick="SignOutFunction()" style="cursor:pointer">
                                         退出
                                           <f:Button runat="server" CssClass="bgbtntop" Text="退出" ToolTip="退出" IconFont="PowerOff" Hidden="true"
@@ -382,6 +382,11 @@
                                 <f:Listener Event="click" Handler="onToolMaximizeClick" />
                             </Listeners>
                         </f:Tool>
+                        <f:Tool runat="server" EnablePostBack="false" IconFont="Eye" CssClass="tabtool" ToolTip="帮助" ID="toolSourceCode">
+                            <Listeners>
+                                <f:Listener Event="click" Handler="onToolSourceCodeClick" />
+                            </Listeners>
+                        </f:Tool>
                         <f:Tool runat="server" EnablePostBack="false" IconFont="SignOut" Hidden="true"
                             CssClass="tabtool" ToolTip="注销" ID="toolSignOut">
                             <Listeners>
@@ -673,7 +678,10 @@
                 window.open(iframeUrl, '_blank');
             }
         }
-
+        // 点击标题栏工具图标 - 查看源代码
+        function onToolSourceCodeClick(event) {
+            window.open('File/智慧施工软件使用说明书.rar', '_blank');
+        }
         // 点击标题栏工具图标 - 注销
         function onToolSignOutClick(event) {
             var bConfirmed = confirm('您确定要退出吗?');
@@ -875,12 +883,12 @@
             // refreshWhenExist： 添加选项卡时，如果选项卡已经存在，是否刷新内部IFrame
             // refreshWhenTabChange: 切换选项卡时，是否刷新内部IFrame
             F.initTreeTabStrip(mainMenu, mainTabStrip, true, false, false);
-            var themeTitle = F.cookie('Theme_Pro_Title');
+            //var themeTitle = F.cookie('Theme_Pro_Title');
-            var themeName = F.cookie('Theme_Pro');
+            //var themeName = F.cookie('Theme_Pro');
-            if (themeTitle) {
+            //if (themeTitle) {
-                F.removeCookie('Theme_Pro_Title');
+            //    F.removeCookie('Theme_Pro_Title');
-                //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
+            //    //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
-            }
+            //}
 
         });
 

SGGL/FineUIPro.Web/indexProject.aspx.designer.cs

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

SGGL/WebAPI/App_Start/WebApiConfig.cs

@@ -21,6 +21,7 @@ namespace WebAPI
             config.EnableCors();
             // Web API 配置和服务
             GlobalConfiguration.Configuration.Formatters.XmlFormatter.SupportedMediaTypes.Clear();
+            config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
             // Web API 路由
             config.MapHttpAttributeRoutes();
             // 

SGGL/WebAPI/WebAPI.csproj

@@ -143,34 +143,6 @@
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
-    <Compile Include="Areas\HelpPage\ApiDescriptionExtensions.cs" />
-    <Compile Include="Areas\HelpPage\App_Start\HelpPageConfig.cs" />
-    <Compile Include="Areas\HelpPage\Controllers\HelpController.cs" />
-    <Compile Include="Areas\HelpPage\HelpPageAreaRegistration.cs" />
-    <Compile Include="Areas\HelpPage\HelpPageConfigurationExtensions.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\CollectionModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ComplexTypeModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\DictionaryModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\EnumTypeModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\EnumValueDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\IModelDocumentationProvider.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\KeyValuePairModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ModelDescriptionGenerator.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ModelNameAttribute.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ModelNameHelper.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ParameterAnnotation.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\ParameterDescription.cs" />
-    <Compile Include="Areas\HelpPage\ModelDescriptions\SimpleTypeModelDescription.cs" />
-    <Compile Include="Areas\HelpPage\Models\HelpPageApiModel.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\HelpPageSampleGenerator.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\HelpPageSampleKey.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\ImageSample.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\InvalidSample.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\ObjectGenerator.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
-    <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
-    <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
     <Compile Include="Controllers\BaseInfoController.cs" />
     <Compile Include="Controllers\CommonController.cs" />
     <Compile Include="Controllers\CQMS\InspectionManagementController.cs" />
@@ -246,7 +218,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Areas\HelpPage\HelpPage.css" />
     <Content Include="Content\bootstrap-theme.css" />
     <Content Include="Content\bootstrap-theme.min.css" />
     <Content Include="Content\bootstrap.css" />
@@ -257,25 +228,6 @@
     <Content Include="Global.asax" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
-    <Content Include="Areas\HelpPage\Views\Web.config" />
-    <Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\ResourceModel.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\Index.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\TextSample.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\SimpleTypeModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\Samples.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\Parameters.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ModelDescriptionLink.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\KeyValuePairModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\InvalidSample.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ImageSample.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\HelpPageApiModel.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\EnumTypeModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\DictionaryModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ComplexTypeModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\CollectionModelDescription.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" />
-    <Content Include="Areas\HelpPage\Views\Help\Api.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Scripts\jquery-3.3.1.intellisense.js" />
     <Content Include="Scripts\jquery-3.3.1.js" />
@@ -292,7 +244,6 @@
     <Content Include="Web.Release.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
-    <Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
     <Content Include="Views\_ViewStart.cshtml" />