Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

2025-07-11 08:59:00 +08:00 · 2025-07-11 08:59:00 +08:00 · 016911d097
parent 7a6078e981 7e635c3609
commit 016911d097
12 changed files with 701 additions and 67 deletions
--- a/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
+++ b/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
@ -0,0 +1,6 @@
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) 
+VALUES (N'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8', N'Ëþµõ¼ÇÂ¼', NULL, N'HSSE/TowerCrane/TowerCraneRecord.aspx', '130', N'28C8EDB9-F1C2-4287-8013-28A976B093E2', N'Menu_HSSE', '1', '1', '1');
+
+Alter TABLE [dbo].[Base_Project]add
+	[AQMAccount] [nvarchar](50) NULL,
+	[AQMPwd] [nvarchar](50) NULL 
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -1436,6 +1436,7 @@
    <Content Include="HSSE\Technique\SpecialScheme.aspx" />
    <Content Include="HSSE\Technique\SpecialSchemeEdit.aspx" />
    <Content Include="HSSE\Technique\SpecialSchemeSelectCloumn.aspx" />
+    <Content Include="HSSE\TowerCrane\TowerCraneRecord.aspx" />
    <Content Include="HSSE\TowerCrane\TowerCrane.aspx" />
    <Content Include="HSSE\TowerCrane\TowerCraneEdit.aspx" />
    <Content Include="HSSE\TowerCrane\TowerCraneState.aspx" />
@ -14496,6 +14497,13 @@
    <Compile Include="HSSE\Technique\SpecialSchemeSelectCloumn.aspx.designer.cs">
      <DependentUpon>SpecialSchemeSelectCloumn.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HSSE\TowerCrane\TowerCraneRecord.aspx.cs">
+      <DependentUpon>TowerCraneRecord.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\TowerCrane\TowerCraneRecord.aspx.designer.cs">
+      <DependentUpon>TowerCraneRecord.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HSSE\TowerCrane\TowerCrane.aspx.cs">
      <DependentUpon>TowerCrane.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx
@ -0,0 +1,145 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TowerCraneRecord.aspx.cs" Inherits="FineUIPro.Web.HSSE.TowerCrane.TowerCraneRecord" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>塔吊</title>
+ 
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel2" runat="server" />
+    <f:Panel ID="Panel2" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"  
+                    EnableCollapse="true" Width="300px" Title="塔吊状态" ShowBorder="true" Layout="HBox"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtIsono" runat="server" Label="塔吊" EmptyText="输入查询条件" AutoPostBack="true"
+                                    OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="70px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:HiddenField ID="hfTowerCraneId" ClientIDMode="Static" runat="server"></f:HiddenField>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="塔吊状态" OnNodeCommand="tvControlItem_NodeCommand"
+                            runat="server" ShowBorder="false" EnableCollapse="true"   
+                            AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" >
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+
+                <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+                ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">       
+                     <Items>
+                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="塔吊" EnableCollapse="true"
+                        runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="TowerCraneRecordId"
+                        AllowCellEditing="true" ClicksToEdit="2" DataIDField="TowerCraneRecordId" AllowSorting="true"
+                        SortField="Date" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                        IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                          EnableTextSelection="True">
+                        <Toolbars>
+                            <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                <Items>       
+                                                
+                                       <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                              LabelAlign="right" >
+                                        </f:DatePicker>
+                                          <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                              LabelAlign="right"  >
+                                        </f:DatePicker> 
+                                    <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询"    Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                        </f:Button>
+                                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                    </f:ToolbarFill> 
+                                </Items>
+                            </f:Toolbar>
+                        </Toolbars>
+                        <Columns>
+                            <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                TextAlign="Center">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField>                  
+                            <f:RenderField Width="220px" ColumnID="AlarmType" DataField="AlarmType"
+                                 SortField="AlarmType" FieldType="String" HeaderText="报警数据"
+                                HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="AmountHoist" DataField="AmountHoist"
+                                SortField="AmountHoist" FieldType="Float" HeaderText="额度吊重" HeaderTextAlign="Center"
+                                TextAlign="Left" >
+                            </f:RenderField>
+
+                            <f:RenderField Width="100px" ColumnID="Camber" DataField="Camber"
+                                SortField="Camber" FieldType="Float" HeaderText="前倾角" HeaderTextAlign="Center"
+                                TextAlign="Center">
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Height" DataField="Height"
+                                SortField="Height" FieldType="Float" HeaderText="高度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Hoist" DataField="Hoist"
+                                SortField="Hoist" FieldType="Float" HeaderText="吊重" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Moment" DataField="Moment"
+                                SortField="Moment" FieldType="String" HeaderText="力矩" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                             <f:RenderField Width="100px" ColumnID="Range" DataField="Range"
+                                SortField="Range" FieldType="Float" HeaderText="幅度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                              <f:RenderField Width="100px" ColumnID="RotationAngle" DataField="RotationAngle"
+                                SortField="RotationAngle" FieldType="Float" HeaderText="回转角度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                              <f:RenderField Width="100px" ColumnID="WindSpeed" DataField="WindSpeed"
+                                SortField="WindSpeed" FieldType="Float" HeaderText="风速" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Date" DataField="Date"
+                                SortField="Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm"
+                                HeaderText="时间" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                   
+                            <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
+                                SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center" ExpandUnusedSpace="true"
+                                TextAlign="Center">
+                            </f:RenderField>
+                    
+                        </Columns>
+                        
+                        <PageItems>
+                            <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                            </f:ToolbarSeparator>
+                            <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                            </f:ToolbarText>
+                            <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                <f:ListItem Text="10" Value="10" />
+                                <f:ListItem Text="15" Value="15" />
+                                <f:ListItem Text="20" Value="20" />
+                                <f:ListItem Text="25" Value="25" />
+                                <f:ListItem Text="所有行" Value="100000" />
+                            </f:DropDownList>
+                        </PageItems>
+                    </f:Grid>
+                </Items>
+                </f:Panel>
+
+        </Items>
+
+    </f:Panel>
+
+    
+    </form>
+    
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs
@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using BLL;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.TowerCrane
+{
+    public partial class TowerCraneRecord : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.InitTreeMenu();//加载树 
+            }
+        }
+        #region 加载树装置-单位-工作区
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+
+            ////塔吊
+            var towerCranes = (from x in Funs.DB.HSSE_TowerCrane
+                               where x.ProjectId == this.CurrUser.LoginProjectId
+                               && (string.IsNullOrEmpty(txtIsono.Text) || x.TowerCraneName.Contains(txtIsono.Text))
+                               orderby x.CreateDate
+                               select x).ToList();
+
+            foreach (var item in towerCranes)
+            {
+                TreeNode rootNode = new TreeNode();
+                rootNode.Text = item.TowerCraneName;
+                rootNode.NodeID = item.TowerCraneId;
+                rootNode.EnableClickEvent = true;
+                this.tvControlItem.Nodes.Add(rootNode);
+            }
+
+        }
+        #endregion
+
+      
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Tree_TextChanged(object sender, EventArgs e)
+        {
+            this.InitTreeMenu();
+
+        }
+
+        
+        /// <summary>
+        /// 树展开事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        { 
+
+            BindGrid();
+        }
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string TowerCraneId = this.tvControlItem.SelectedNodeID;
+            if (!string.IsNullOrEmpty(TowerCraneId))
+            {
+                string strSql = @"SELECT * from  HSSE_TowerCraneRecord WHERE ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " TowerCraneId = @TowerCraneId";
+                listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId));
+
+
+                strSql += " order by Date desc";
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                if (table != null && table.Rows.Count > 0)
+                {
+                    Dictionary<string, string> alarmMap = new Dictionary<string, string>();
+
+                    alarmMap.Add("111", "重量预警");
+                    alarmMap.Add("112", "重量报警");
+                    alarmMap.Add("121", "风速预警");
+                    alarmMap.Add("122", "风速报警");
+                    alarmMap.Add("131", "内限位报警");
+                    alarmMap.Add("132", "内限位预警");
+                    alarmMap.Add("133", "外限位预警");
+                    alarmMap.Add("134", "外限位报警");
+                    alarmMap.Add("141", "倾角预警");
+                    alarmMap.Add("142", "倾角报警");
+                    alarmMap.Add("151", "上限位预警");
+                    alarmMap.Add("152", "上限位报警");
+                    alarmMap.Add("201", "障碍物碰撞报警");
+                    alarmMap.Add("202", "塔机群碰撞报警");
+
+                    foreach (DataRow row in table.Rows)
+                    {
+                        string AlarmType = row["AlarmType"].ToString();
+                        if (!string.IsNullOrEmpty(AlarmType))
+                        {
+                            var alarms = AlarmType.Replace("[", "").Replace("]", "").Split(',');
+                            string res = "";
+                            foreach (string alarm in alarms)
+                            {
+                                if (alarmMap.ContainsKey(alarm))
+                                {
+                                    res += alarmMap[alarm] + ",";
+                                }
+                            }
+                            row["AlarmType"] = res.TrimEnd(',');
+                        }
+
+                    }
+                }
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+            else
+            {
+                Grid1.DataSource = null;
+                Grid1.DataBind();
+            }
+        }
+
+        #region 分页 排序
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+         
+
+         
+ 
+
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+    }
+}
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs
@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.TowerCrane
+{
+
+
+    public partial class TowerCraneRecord
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// txtIsono 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsono;
+
+        /// <summary>
+        /// hfTowerCraneId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hfTowerCraneId;
+
+        /// <summary>
+        /// tvControlItem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvControlItem;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
@ -144,6 +144,26 @@
                                </f:Form>
                            </Items>
                        </f:GroupPanel>
+
+                         <f:GroupPanel ID="GroupPanel4" Layout="Anchor" Title="安全帽平台" runat="server">
+                            <Items>
+                                <f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                    Layout="VBox" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+                                    LabelAlign="Right">
+                                    <Rows>
+                                        <f:FormRow>
+                                            <Items>
+                                               <f:TextBox ID="txtAQMAccount" runat="server" Label="账号"  MaxLength="50" >
+                                                </f:TextBox>
+                                                <f:TextBox ID="txtAQMPwd" runat="server" Label="密码"    MaxLength="50">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        
+                                    </Rows>
+                                </f:Form>
+                            </Items>
+                        </f:GroupPanel>
                    </Items>
                    <Toolbars>
                        <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
@ -54,6 +54,8 @@ namespace FineUIPro.Web.common.ProjectSet
            if (getProject != null )
            {
                getProject.IsFace = this.ckbIsFace.Checked;
+                getProject.AQMAccount = this.txtAQMAccount.Text;
+                getProject.AQMPwd = this.txtAQMPwd.Text;
                Funs.DB.SubmitChanges();
            }
            #endregion
@ -294,9 +296,20 @@ namespace FineUIPro.Web.common.ProjectSet
        {
            ///通用
            var getProject = ProjectService.GetProjectByProjectId(projectId);
-            if (getProject != null && getProject.IsFace == true)
+            if (getProject != null )
            {
-                this.ckbIsFace.Checked = true;
+                if (getProject.IsFace == true)
+                {
+                    this.ckbIsFace.Checked = true;
+                }
+                if (!string.IsNullOrEmpty(getProject.AQMPwd))
+                {
+                    this.txtAQMPwd.Text = getProject.AQMPwd;
+                }
+                if (!string.IsNullOrEmpty(getProject.AQMAccount))
+                {
+                    this.txtAQMAccount.Text = getProject.AQMAccount;
+                }
            }

            var q = from x in Funs.DB.Project_Sys_Set where x.ProjectId == projectId select x;
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs
@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.common.ProjectSet {
+namespace FineUIPro.Web.common.ProjectSet
+{


-    public partial class ProjectSysSet {
+    public partial class ProjectSysSet
+    {

        /// <summary>
        /// form1 控件。
@ -309,6 +311,42 @@ namespace FineUIPro.Web.common.ProjectSet {
        /// </remarks>
        protected global::FineUIPro.Label Label2;

+        /// <summary>
+        /// GroupPanel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel4;
+
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+
+        /// <summary>
+        /// txtAQMAccount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAQMAccount;
+
+        /// <summary>
+        /// txtAQMPwd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAQMPwd;
+
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
--- a/SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx
+++ b/SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx
@ -8,22 +8,25 @@
    <title>意见收集</title>
    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
    <style>
-        container-title-tt {
-            display: none !important
-        }
+        container-title-tt{display:none !important}
    </style>
 </head>
+    
 <body>
    <form id="form1" runat="server">
        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
            <Items>
-                <f:ContentPanel ID="ContentPanel1" CssClass="bodyregion" ShowBorder="false" ShowHeader="false" runat="server" Height="800">
-                    <iframe id="ifZHDD" runat="server" allow="microphone;camera;midi;encrypted-media;" allowfullscreen="true" width="100%" height="878" frameborder="0" style="margin-top: -78px"></iframe>
-                </f:ContentPanel>
+                   <f:ContentPanel ID="ContentPanel1" CssClass="bodyregion" ShowBorder="false" ShowHeader="false" runat="server" Height="800">
+                       <iframe  id="ifZHDD"  runat="server" allow="microphone;camera;midi;encrypted-media;"  allowfullscreen="true" width="100%"  height="878" frameborder="0"  style="margin-top:-78px">
+                       </iframe>
+                        
+                   </f:ContentPanel>
            </Items>
        </f:Panel>
+      
    </form>
+    
 </body>
 </html>
--- a/SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx.cs
@ -13,6 +13,8 @@ namespace FineUIPro.Web.ZHDD
 {
    public partial class ZHDD : PageBase
    {
+        
+
        #region 加载页面
        /// <summary>
        /// 加载页面
@ -23,22 +25,23 @@ namespace FineUIPro.Web.ZHDD
        {
            if (!IsPostBack)
            {
-                //string username = "rdys_test";
-                //string password = "Runde.2024";
-                string username = "合肥诺必达";
-                string password = "Hf123456@";
-                var res1 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_pkey&user_name=" + username + "&pwd=" + password, "POST");
+                var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
+                string username = project.AQMAccount;// "bruce";
+                string password = project.AQMPwd;// "Admin!@%2316891#16891";
+                var res1 = APIGetHttpService.Http("https://aqm.cwcec.com/api/index.php", "POST", "application/x-www-form-urlencoded", null,"ctl=tool&act=get_pkey&user_name=" + username + "&pwd="+ password);
                var j1 = JsonConvert.DeserializeObject<dynamic>(res1);
                string data = j1.data;

-                var res2 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_token&user_name=" + username + "&pkey=" + j1.data, "POST");
+                var res2 = APIGetHttpService.Http("https://aqm.cwcec.com/api/index.php?ctl=tool&act=get_token&user_name=" + username + "&pkey="+j1.data, "POST");
                var j2 = JsonConvert.DeserializeObject<dynamic>(res2);
                string session_id = j2.session_id;
                string token = j2.token;
-                ifZHDD.Src = "https://caps.runde.pro/login/#token=" + session_id + "&user_name=" + username + "target=home";
+                ifZHDD.Src = "https://aqm.cwcec.com/login/#token=" + session_id+"&user_name=" + username + "target=home";
            }
        }
-        #endregion
+
+         #endregion
+
   
    }
 }
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@ -537,10 +537,10 @@
        </f:Button>
       <%-- <f:Button runat="server" CssClass="bgbtn" Text="指挥调度中心" OnClick="btnCommandDispatch_Click" OnClientClick="openCommandDispatchCenter();"
            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCommandDispatch" Hidden="true">
-        </f:Button>--%>
+        </f:Button>
        <f:Button runat="server" CssClass="bgbtn" Text="指挥调度中心" OnClick="btnCommandDispatch_Click" OnClientClick="parent.removeActiveTab();"
            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCommandDispatch" Hidden="true">
-        </f:Button>
+        </f:Button>--%>
        <f:Button runat="server" CssClass="bgbtn" Text="现场考勤" OnClick="btnPDigData_Click" OnClientClick="parent.removeActiveTab();"
            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPDigData" Hidden="true">
        </f:Button>
--- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
@ -500,15 +500,6 @@ namespace FineUIPro.Web
        /// </remarks>
        protected global::FineUIPro.Button btnDigitalSite;

-        /// <summary>
-        /// btnCommandDispatch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnCommandDispatch;
-
        /// <summary>
        /// btnPDigData 控件。
        /// </summary>