看板图表样式；人员报验补充查询条件；

DataBase/版本日志/SGGLDB_WH_2025-07-01.sql

@@ -0,0 +1,11 @@
+
+
+--1、企业总部人员表补充排序
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Person_CompanyBranchPerson' AND COLUMN_NAME = 'SortIndex')
+BEGIN
+	ALTER TABLE Person_CompanyBranchPerson ADD SortIndex int;
+END
+GO
+
+
+

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -544,116 +544,6 @@ namespace BLL
             return result;
         }
 
-        public static HSSEData StatisticalData()
-        {
-            var thisUnitId = string.Empty;
-            var thisUnit = CommonService.GetIsThisUnit();
-            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
-            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
-            Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
-
-            var totalEnergyConsumption = ChemicalReportItemService.GetLatstTimeTotalEnergyConsumption();
-            var incomeComprehensiveEnergyConsumption =
-                ChemicalReportItemService.GetLatstTimeIncomeComprehensiveEnergyConsumption();
-            var newWaterConsumption = ChemicalReportItemService.GetLatstTimeNewWaterConsumption();
-
-            var table = new HSSEData_HSSE
-            {
-                UnitId = thisUnitId,
-                CollCropCode = baseUnit.CollCropCode,
-                UnitName = baseUnit.UnitName,
-                ReportDate = DateTime.Now.Date,
-                BeUnderConstructionNum = GetBeUnderConstruction().Count,
-                ShutdownNum = GetShutdown().Count,
-                JoinConstructionPersonNum = GetJoinConstructionPerson().Count,
-                MajorProjectsUnderConstructionNum = GetMajorProjectsUnderConstruction().Count,
-                TotalWorkingHour = GetTotalWorkingHour(),
-                LostWorkingHour = GetLostWorkingHour(),
-                SafeWorkingHour = GetSafeWorkingHour(),
-                SafeTrainNum = GetSafeTrain().Sum(x => x.TrainPersonNum) + GetBoShengSafeTrain().Sum(x => x.TrainPersonNum),
-                SpecialTrainNum = GetSpecialTrain().Sum(x => x.TrainPersonNum),
-                SpecialOperationTrainNum = GetSpecialOperationTrain().Sum(x => x.TrainPersonNum),
-                EnvironmentalTrainNum = 0,
-                TotalEnergyConsumption = totalEnergyConsumption,
-                IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
-                NewWaterConsumption = newWaterConsumption,
-                HeadOfficeInspectorGeneralNum = GetHeadOfficeInspectorGeneral().Count,
-                HeadOfficeFullTimeNum = GetHeadOfficeFullTime().Count,
-                BranchInspectorGeneralNum = GetBranchInspectorGeneral().Count,
-                BranchFullTimeNum = GetBranchFullTime().Count,
-                ProjectInspectorGeneralNum = GetProjectInspectorGeneral().Count,
-                ProjectFullTimeNum = GetProjectFullTime().Count,
-                ProjectSafetyMonitorNum = GetProjectSafetyMonitor().Count,
-                SafetyInjectionEngineer = GetSafetyInjectionEngineer().Count,
-                CertificateANum = GetCertificateA().Count,
-                CertificateBNum = GetCertificateB().Count,
-                CertificateCNum = GetCertificateC().Count,
-                SafetyCommitteeMeetingNum = GetSafetyCommitteeMeeting().Count,
-                EnterpriseTopicsMeetingNum = GetEnterpriseTopicsMeeting().Count,
-                ProjectSafetyLeadingGroupMeetingNum = GetProjectSafetyLeadingGroupMeeting().Count,
-                ProjectSafetyMeetingNum = GetProjectSafetyMeeting().Count,
-                CompanyLeadShiftCheckNum = GetCompanyLeadShiftCheck().Count,
-                CompanyComprehensiveCheckNum = GetCompanyComprehensiveCheck().Count,
-                CompanySpecialCheckNum = GetCompanySpecialCheck().Count,
-                ProjectLeadShiftCheckNum = GetProjectLeadShiftCheck().Count,
-                ProjectSpecialCheckNum = GetProjectSpecialCheck().Count,
-                ProjectMajorCheckNum = GetProjectMajorCheck().Count,
-                NearMissNum = GetNearMiss().Count,
-                RecordableEventNum = GetRecordableEvent().Count,
-                GeneralAccidentNum = GetGeneralAccident().Count,
-                MajorAccidentNum = GetMajorAccident().Count,
-                SeriousAccidentNum = GetSeriousAccident().Count,
-                SpecialSeriousAccidentNum = GetSpecialSeriousAccident().Count,
-                CompanyComprehensivePlanNum = GetCompanyComprehensivePlan().Count,
-                CompanySpecialPlanNum = GetCompanySpecialPlan().Count,
-                CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan().Count,
-                CompanyDrillNum = GetCompanyDrill().Count,
-                ProjectComprehensivePlanNum = GetProjectComprehensivePlan().Count,
-                ProjectSpecialPlanNum = GetProjectSpecialPlan().Count,
-                ProjectOnSiteDisposalPlan = GetProjectOnSiteDisposalPlan().Count,
-                ProjectDrillNum = GetProjectDrill().Count,
-                CostExtract = Convert.ToInt32(GetCostExtract().Sum(x => x.SUMCost)),
-                CostUse = Convert.ToInt32(GetCostUse().Sum(x => x.SUMCost)),
-                UseEquipmentNum = GetUseEquipment().Count,
-                SpecialEquipmentNum = GetSpecialEquipment().Count,
-                LicensesNum = GetLicenses().Count,
-                LicensesCloseNum = GetLicensesClose().Count,
-                GeneralClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.RecNum),
-                GeneralNotClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.NoRecNum),
-                MajorClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.RecNum),
-                MajorNotClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.NoRecNum),
-                GeneralRiskNum = GetSecurityRiskOutputs().Sum(x => x.GeneralRiskNum),
-                LowRiskNum = GetSecurityRiskOutputs().Sum(x => x.LowRiskNum),
-                MediumRiskNum = GetSecurityRiskOutputs().Sum(x => x.MediumRiskNum),
-                HighRiskNum = GetSecurityRiskOutputs().Sum(x => x.HighRiskNum),
-                CompletedNum = GetLargeEngineeringOutputs().Sum(x => x.CompletedNum),
-                TrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.TrainPersonNum),
-                ConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.ConstructionNum),
-                FinishedNum = GetLargeEngineeringOutputs().Sum(x => x.FinishedNum),
-                SuperCompletedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperCompletedNum),
-                SuperTrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.SuperTrainPersonNum),
-                SuperConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.SuperConstructionNum),
-                SuperFinishedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperFinishedNum),
-                CreateMan = Const.sysglyId,
-                CreateDate = DateTime.Now
-            };
-            if (IsReportByToday())
-            {
-                table.Id = GetTodayData().Id;
-                table.State = Const.CNCEC_State_1;
-                UpdateHSSEData_HSSE(table);
-            }
-            else
-            {
-                table.Id = SQLHelper.GetNewID();
-                table.State = Const.CNCEC_State_0;
-                AddHSSEData_HSSE(table);
-            }
-
-            var data = GetItemByHSSEData_HSSE(table, Project_HSSEData_HiddenDangerDetailService.GetTodayModel());
-            return data;
-        }
-
         /// <summary>
         /// 统计数据(异步)
         /// </summary>
@@ -687,6 +577,7 @@ namespace BLL
             var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
             var safeWorkingHourTask = HSSEData_HSSEService.GetSafeWorkingHourAsync();
             var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
+            var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
             var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
             var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
             var hseTechnicalTask = HSSEData_HSSEService.GetHseTechnicalAsync();
@@ -754,6 +645,7 @@ namespace BLL
                 lostWorkingHourTask,
                 safeWorkingHourTask,
                 safeTrainTask,
+                safeTrainBoShengTask,
                 specialTrainTask,
                 specialOperationTrainTask, hseTechnicalTask,
                 headOfficeInspectorGeneralTask,
@@ -821,6 +713,7 @@ namespace BLL
             var lostWorkingHour = await lostWorkingHourTask;
             var safeWorkingHour = await safeWorkingHourTask;
             var safeTrainList = await safeTrainTask;
+            var safeTrainBoShengList = await safeTrainBoShengTask;
             var specialTrainList = await specialTrainTask;
             var specialOperationTrainList = await specialOperationTrainTask;
             var hseTechnicalList = await hseTechnicalTask;
@@ -890,7 +783,7 @@ namespace BLL
                 TotalWorkingHour = totalWorkingHour,
                 LostWorkingHour = lostWorkingHour,
                 SafeWorkingHour = safeWorkingHour,
-                SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum),
+                SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Sum(x => x.TrainPersonNum),
                 SpecialTrainNum = specialTrainList.Sum(x => x.TrainPersonNum),
                 SpecialOperationTrainNum = specialOperationTrainList.Sum(x => x.TrainPersonNum),
                 HseTechnicalNum = hseTechnicalList.Count(),
@@ -1037,7 +930,7 @@ namespace BLL
                     TotalWorkingHour = 0,//工时数据取自集团报表，项目无法提取
                     LostWorkingHour = 0,
                     SafeWorkingHour = 0,
-                    SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialTrainNum = specialTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialOperationTrainNum = specialOperationTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     HseTechnicalNum = hseTechnicalList.Count(x => x.ProjectId == projectid),

SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using FineUIPro;
+using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using Newtonsoft.Json;
 
@@ -455,7 +456,7 @@ namespace BLL
 
             if (hSseDateType == HSSEDateType.EducationAndTraining || hSseDateType == HSSEDateType.All)
             {
-                table.SafeTrainNum = GetSafeTrainNum(projectid);
+                table.SafeTrainNum = GetSafeTrainNum(projectid) + GetBoShengSafeTrain(projectid);
                 table.SpecialTrainNum = GetSpecialTrainNum(projectid);
                 table.SpecialOperationTrainNum = GetSpecialOperationTrainNum(projectid);
             }
@@ -748,6 +749,21 @@ namespace BLL
             return result;
         }
 
+        /// <summary>
+        ///     获取三级安全教育培训数——博晟培训
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBoShengSafeTrain(string projectid)
+        {
+            var result = (from x in Funs.DB.Bo_Sheng_Train
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          where x.ProjectId == projectid && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训")
+                                && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
+                          select x.PersonCount ?? 0).ToList().Sum();
+            return result;
+        }
+
         /// <summary>
         ///     获取专项培训数
         /// </summary>

SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs

@@ -53,6 +53,7 @@ namespace BLL
                 Address = CompanyBranchPerson.Address,
                 IsOnJob = CompanyBranchPerson.IsOnJob,
                 Remark = CompanyBranchPerson.Remark,
+                SortIndex = CompanyBranchPerson.SortIndex,
             };
             db.Person_CompanyBranchPerson.InsertOnSubmit(newCompanyBranchPerson);
             db.SubmitChanges();
@@ -77,6 +78,7 @@ namespace BLL
                 newCompanyBranchPerson.Address = CompanyBranchPerson.Address;
                 newCompanyBranchPerson.IsOnJob = CompanyBranchPerson.IsOnJob;
                 newCompanyBranchPerson.Remark = CompanyBranchPerson.Remark;
+                newCompanyBranchPerson.SortIndex = CompanyBranchPerson.SortIndex;
                 db.SubmitChanges();
             }
         }

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx

@@ -10,13 +10,16 @@
         .f-grid-row.Red {
             background-color: red;
         }
+
         .f-grid-row.Yellow {
             background-color: yellow;
         }
+
         .LabelColor {
             color: Red;
             font-size: small;
         }
+
         .f-grid-row.Gray {
             background-color: gray;
         }
@@ -41,6 +44,12 @@
                                 </f:DropDownList>
                                 <f:DropDownList ID="sdrpPost" runat="server" Label="工种" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
                                 <f:TextBox runat="server" ID="stxtPersonName" Label="姓名" LabelAlign="Right" LabelWidth="60px"></f:TextBox>
+                                <f:RadioButtonList ID="rblOnSite" runat="server" AutoPostBack="true" Width="220px"
+                                    OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Value="-1" Text="全部" Selected="true" />
+                                    <f:RadioItem Value="1" Text="在场" />
+                                    <f:RadioItem Value="0" Text="不在场" />
+                                </f:RadioButtonList>
                                 <f:Button ID="btnSearch" Icon="SystemSearch"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -81,6 +90,9 @@
                         <f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="IsOnSiteStr" DataField="IsOnSiteStr" FieldType="String" HeaderText="是否在场" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
                         <f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
@@ -103,7 +115,7 @@
                         </f:TemplateField>--%>
                         <%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
                         Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionPersonId" DataIFrameUrlFormatString="./InspectionPersonApprove.aspx?Id={0}"/>--%>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
                                     Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>' ToolTip="附件查看"></asp:LinkButton>

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.Comprehensive
             string strSql = @"select InspectionPersonId, InspectionPersonCode, PersonName, Status,
                               CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime, 
                               DepartureTime, AttachUrl,CompileMan, CompileDate, 
-                              IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
+                              IsOnSite, (case C.IsOnSite when '1' then '是' else  '否' end) as IsOnSiteStr,UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
                               from Comprehensive_InspectionPerson C 
                               left join Base_Unit U on C.UnitId=U.UnitId
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
@@ -58,6 +58,13 @@ namespace FineUIPro.Web.Comprehensive
                 strSql += " AND PersonName like @PersonName";
                 listStr.Add(new SqlParameter("@PersonName", "%" + this.stxtPersonName.Text.Trim() + "%"));
             }
+            int OnSite = int.Parse(this.rblOnSite.SelectedValue);
+            if (OnSite > -1)
+            {
+                strSql += " AND C.IsOnSite=@IsOnSite";
+                listStr.Add(new SqlParameter("@IsOnSite", OnSite));
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -113,6 +120,15 @@ namespace FineUIPro.Web.Comprehensive
         {
             BindGrid();
         }
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
         #endregion
 
         #region 关闭弹出窗口

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
+namespace FineUIPro.Web.Comprehensive
+{
 
 
-    public partial class InspectionPerson {
+    public partial class InspectionPerson
+    {
 
         /// <summary>
         /// form1 控件。
@@ -84,6 +86,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.TextBox stxtPersonName;
 
+        /// <summary>
+        /// rblOnSite 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblOnSite;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx

@@ -16,7 +16,7 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业总部人员" EnableCollapse="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CompanyBranchPersonId"
                  DataIDField="CompanyBranchPersonId" AllowSorting="true" ForceFit="true"
-                SortField="PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                SortField="SortIndex" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
                 IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                 <Toolbars>

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Person
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
+            string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,SortIndex,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
                 + @" FROM Person_CompanyBranchPerson AS CompanyBranchPerson "
                 + @" LEFT JOIN Base_WorkPost AS WorkPost ON CompanyBranchPerson.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx

@@ -37,17 +37,22 @@
                     <Items>
                         <f:TextBox ID="txtTelephone" runat="server" Label="电话" MaxLength="50" LabelWidth="90px">
                         </f:TextBox>
-                        <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
+                        <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True">
+                        <f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True" LabelWidth="90px">
                             <f:RadioItem Value="True" Text="是" Selected="true" />
                             <f:RadioItem Value="False" Text="否" />
                         </f:RadioButtonList>
-                        <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" >
+                        <f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelAlign="Right"  Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" LabelWidth="90px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs

@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
+using FineUIPro.Web.Comprehensive;
 
 namespace FineUIPro.Web.ZHGL.Person
 {
@@ -83,6 +84,7 @@ namespace FineUIPro.Web.ZHGL.Person
                             this.rblIsOnJob.SelectedValue = "False";
                         }
                         this.txtRemark.Text = CompanyBranchPerson.Remark;
+                        this.txtSortIndex.Text = CompanyBranchPerson.SortIndex.HasValue ? CompanyBranchPerson.SortIndex.ToString() : "";
                     }
                 }
             }
@@ -116,6 +118,7 @@ namespace FineUIPro.Web.ZHGL.Person
                 IsOnJob = Convert.ToBoolean(this.rblIsOnJob.SelectedValue),
                 Remark = this.txtRemark.Text.Trim()
             };
+            newCompanyBranchPerson.SortIndex = Funs.GetNewInt(this.txtSortIndex.Text.Trim());
             if (this.drpWorkPost.SelectedValue != Const._Null)
             {
                 newCompanyBranchPerson.WorkPostId = this.drpWorkPost.SelectedValue;

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ZHGL.Person {
+namespace FineUIPro.Web.ZHGL.Person
+{
 
 
-    public partial class CompanyPersonEdit {
+    public partial class CompanyPersonEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -102,6 +104,15 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsOnJob;
 
+        /// <summary>
+        /// txtSortIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtSortIndex;
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx

@@ -526,6 +526,35 @@
                     fontSize: 10,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -541,6 +570,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,   
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -590,7 +620,6 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -675,6 +704,35 @@
                     fontSize: '10'
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    yAxisIndex: [0],
+                    left: 0, width: 10, height: '100%',
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             yAxis: {
                 axisTick: {
                     show: false
@@ -793,6 +851,35 @@
                     color: '#ffffff'
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -808,6 +895,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -856,7 +944,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 28,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx

@@ -395,6 +395,35 @@
                 show: true
             },
             tooltip: {},
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             legend: {
                 left: '10%',
                 show: true,
@@ -418,6 +447,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -467,7 +497,7 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -527,6 +557,35 @@
                 //data: ['销量'],
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -536,7 +595,10 @@
                         color: 'rgba(255, 255, 255, 0.3)'
                     }
                 },
+         
                 axisLabel: {
+                    interval: 0,      // 坐标轴刻度标签的显示间隔
+                    rotate: -15,        // 标签倾斜的角度
                     show: true,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -593,7 +655,7 @@
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx

@@ -412,6 +412,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -423,7 +452,8 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 },
                 axisLabel: {
                     show: true,
-                    /*interval: 0,*/
+                    interval: 0,
+                    rotate: -15, 
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -453,7 +483,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -546,7 +576,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -600,6 +630,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
                     fontSize: 10,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -612,6 +671,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 axisLabel: {
                     show: true,
                     interval: 0,
+                    rotate: -15,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -641,7 +701,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',                
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -696,6 +756,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -739,7 +828,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 10,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx

@@ -316,6 +316,35 @@
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -327,7 +356,8 @@
                 },
                 axisLabel: {
                     show: true,
-                    /*interval: 0,*/
+                    interval: 0,
+                    rotate: -15,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -357,7 +387,7 @@
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -445,6 +475,7 @@
                 },
                 axisLabel: {
                     show: true,
+                    rotate: -15,
                     interval: 0,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -470,12 +501,41 @@
                     }
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             series: series,
             grid: {
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',                
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx

@@ -340,6 +340,35 @@
                     fontSize: 12,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -355,6 +384,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -404,7 +434,7 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -489,6 +519,35 @@
                     fontSize: 12,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -504,6 +563,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -640,6 +700,35 @@
                     fontWeight: 700
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -655,6 +744,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15, 
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -703,7 +793,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -769,6 +859,35 @@
                     fontWeight: 700
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -784,6 +903,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -832,7 +952,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -1732,7 +1732,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -20, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                     textStyle: {
@@ -1744,6 +1744,35 @@
                 }
 
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             yAxis: {
                 type: 'value',
                 axisLine: {
@@ -2585,6 +2614,8 @@
                     }
                 },
                 axisLabel: {
+                    interval: 0,
+                    rotate: -15,
                     show: true,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -2593,11 +2624,40 @@
                 }
             },
             series: data,
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             grid: {
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/main_new.aspx

@@ -935,8 +935,8 @@
         let label = [<%=ProjectPersonMc%>]
         let opt = {
             grid: {
-                top: fontSize(30),
+                //top: fontSize(30),
-                bottom: fontSize(40)
+                //bottom: fontSize(40)
             },
             dataZoom: [
                 {
@@ -972,7 +972,7 @@
                 data: label,
                 axisLabel: {
                     interval: 0,//使x轴文字显示全
-                    rotate: -10,       // 标签倾斜的角度
+                    rotate: -15,       // 标签倾斜的角度
                     color: '#3FB0FF'
                 },
                 axisLine: {
@@ -2229,8 +2229,6 @@
         let opt = {
             grid: {
                 top: 30,
-                bottom: 40,
-
             },
             xAxis: {
                 type: 'category',
@@ -2242,7 +2240,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -16, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },
@@ -2456,8 +2454,6 @@
         let opt = {
             grid: {
                 top: 60,
-                bottom: 40,
-
             },
             legend: {
                 top: 30,
@@ -2486,7 +2482,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -10, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },

SGGL/FineUIPro.Web/common/main_new0.aspx

@@ -696,8 +696,7 @@
                 data: [{ name: '<%=All%>', textStyle: { color: '#2F69D6' } }, { name: '<%=To_be_rectified%>', textStyle: { color: '#FFA602' } }]
             },
             grid: {
-                top: fontSize(60),
+                top: fontSize(60)
-                bottom: fontSize(40)
             },
             dataZoom: [
                 {
@@ -707,7 +706,7 @@
                     maxValueSpan: 6,
                     show: true,
                     xAxisIndex: [0],
-                    bottom: 25, height: 10,
+                    bottom: 0, height: 10,
                     backgroundColor: 'rgba(0,0,0,0)',
                     borderColor: 'none',
                     brushSelect: false,
@@ -754,7 +753,7 @@
                 },
                 axisLabel: {
                     interval: 0,      // 坐标轴刻度标签的显示间隔
-                    rotate: -10        // 标签倾斜的角度
+                    rotate: -15        // 标签倾斜的角度
                 }
             },
             yAxis: {

SGGL/Model/Model.cs

@@ -280111,6 +280111,8 @@ namespace Model
 		
 		private string _Remark;
 		
+		private System.Nullable<int> _SortIndex;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<Base_WorkPost> _Base_WorkPost;
@@ -280139,6 +280141,8 @@ namespace Model
     partial void OnIsOnJobChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
     #endregion
 		
 		public Person_CompanyBranchPerson()
@@ -280356,6 +280360,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Person_CompanyBranchPerson_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-06-28T03:40:36.0544739Z||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-07-01T02:14:59.0471052Z||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>06/28/2025 11:40:34</publishTime>
+      <publishTime>07/01/2025 10:14:57</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>06/28/2025 11:40:34</publishTime>
+      <publishTime>07/01/2025 10:14:57</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>06/28/2025 11:40:10</publishTime>
+      <publishTime>07/01/2025 10:14:38</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>06/28/2025 11:40:10</publishTime>
+      <publishTime>07/01/2025 10:14:38</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>06/27/2025 15:09:55</publishTime>
+      <publishTime>07/01/2025 10:14:33</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>06/27/2025 15:09:55</publishTime>
+      <publishTime>07/01/2025 10:14:33</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>06/28/2025 11:40:14</publishTime>
+      <publishTime>07/01/2025 10:14:42</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>06/28/2025 11:40:14</publishTime>
+      <publishTime>07/01/2025 10:14:42</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>06/28/2025 11:40:14</publishTime>
+      <publishTime>07/01/2025 10:14:42</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>06/28/2025 11:40:15</publishTime>
+      <publishTime>07/01/2025 10:14:43</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>