From 08e97acd4a9ec18c8a1908d03f176b0e6e5fb877 Mon Sep 17 00:00:00 2001 From: zonse <765289303@ZONES> Date: Sat, 10 May 2025 20:39:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E5=89=8D=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/common/main3.aspx | 12 +- SGGL/FineUIPro.Web/common/main3.aspx.cs | 24 +- SGGL/FineUIPro.Web/common/mainProject.aspx | 11 +- SGGL/FineUIPro.Web/common/mainProject.aspx.cs | 283 +++++++++-------- .../common/mainProject.aspx.designer.cs | 297 ------------------ SGGL/FineUIPro.Web/res/css/base.css | 2 +- SGGL/FineUIPro.Web/res/css/mainindex.css | 12 +- SGGL/FineUIPro.Web/res/css/projectIndex.css | 18 +- SGGL/Model/APIItem/HSSE/MeetingItem.cs | 5 + 9 files changed, 204 insertions(+), 460 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/main3.aspx b/SGGL/FineUIPro.Web/common/main3.aspx index 0d087c7..50779c1 100644 --- a/SGGL/FineUIPro.Web/common/main3.aspx +++ b/SGGL/FineUIPro.Web/common/main3.aspx @@ -17,7 +17,8 @@ input[type="date"] { background-color: rgba(0,0,0,0); color: #ffffff; - font-size: .175rem; + font-size: 0.2rem; + font-weight: 700; } img { @@ -179,7 +180,7 @@
-
+ <%--
@@ -197,7 +198,7 @@
- + --%>
<%--
@@ -483,6 +484,11 @@ grid: { top: 30, }, + tooltip: { + textStyle: { + fontSize: 20 + } + }, xAxis: { type: 'category', data: tit, diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs index 3e34905..ac99a40 100644 --- a/SGGL/FineUIPro.Web/common/main3.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs @@ -86,12 +86,30 @@ namespace FineUIPro.Web.common { DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00")); DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59")); - int m_count = Funs.DB.Project_ProjectUser.Count(); - int job_count = (from x in Funs.DB.Meeting_ClassMeeting + + var m_count = Funs.DB.Meeting_ClassMeeting + .Where(mc => mc.ClassMeetingDate >= startd && + mc.ClassMeetingDate <= endd) + .GroupBy(mc => new + { + MeetingDate = mc.ClassMeetingDate.Value.Date, + mc.ProjectId + }) + .Select(g => new + { + MeetingDate = g.Key.MeetingDate, + ProjectId = g.Key.ProjectId, + DailyMaxManagePersonNum = g.Max(mc => mc.ManagePersonNum ?? 0) + }) + .OrderBy(r => r.MeetingDate) + .ThenBy(r => r.ProjectId) + .ToList().Sum(x => x.DailyMaxManagePersonNum); + var job_count = (from x in Funs.DB.Meeting_ClassMeeting where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd select new Model.MeetingItem { - AttentPersonNum = x.AttentPersonNum ?? 0, + ProjectId = x.ProjectId, + AttentPersonNum = x.AttentPersonNum ?? 0 }).ToList().Sum(s => s.AttentPersonNum); diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx index 39e2894..7ed7e13 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx @@ -22,7 +22,8 @@ input[type="date"] { background-color: rgba(0,0,0,0); color: #ffffff; - font-size: .175rem; + font-size: 0.2rem; + font-weight: 700; } input[type="date"]::-webkit-calendar-picker-indicator { @@ -257,7 +258,7 @@
--%> -
+ <%--
@@ -275,7 +276,7 @@
- + --%>
@@ -305,7 +306,7 @@
-
+ <%--
@@ -428,7 +429,7 @@
PM10
0
-
+
--%>
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index 6f6e815..8a714a1 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -86,20 +86,31 @@ namespace FineUIPro.Web.common { DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00")); DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59")); - var meet = (from x in Funs.DB.Meeting_ClassMeeting - where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd - select new Model.MeetingItem - { - AttentPersonNum = x.AttentPersonNum ?? 0, - ManagePersonNum = x.ManagePersonNum ?? 0, - }).ToList(); - var m_count = 0; - var job_count = 0; - if (meet.Count() > 0) + + var m_count = Funs.DB.Meeting_ClassMeeting + .Where(mc => mc.ProjectId == ProjectId && mc.ClassMeetingDate >= startd && + mc.ClassMeetingDate <= endd) + .GroupBy(mc => new { - m_count = meet.Where(m => m.ManagePersonNum != null).Max(m => m.ManagePersonNum); - job_count = meet.Sum(s => s.AttentPersonNum); - } + MeetingDate = mc.ClassMeetingDate.Value.Date, + mc.ProjectId + }) + .Select(g => new + { + MeetingDate = g.Key.MeetingDate, + ProjectId = g.Key.ProjectId, + DailyMaxManagePersonNum = g.Max(mc => mc.ManagePersonNum ?? 0) + }) + .OrderBy(r => r.MeetingDate) + .ThenBy(r => r.ProjectId) + .ToList().Sum(x => x.DailyMaxManagePersonNum); + var job_count = (from x in Funs.DB.Meeting_ClassMeeting + where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd + select new Model.MeetingItem + { + AttentPersonNum = x.AttentPersonNum ?? 0, + ManagePersonNum = x.ManagePersonNum ?? 0, + }).ToList().Sum(s => s.AttentPersonNum); return new { @@ -217,23 +228,23 @@ namespace FineUIPro.Web.common { try { - divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##"); - divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##"); - divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##"); - divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##"); - divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##"); - divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##"); + //divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##"); + //divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##"); + //divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##"); + //divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##"); + //divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##"); + //divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##"); } catch (Exception ex) { } } else { - divHJ1.InnerHtml = "0"; - divHJ2.InnerHtml = "0"; - divHJ3.InnerHtml = "0"; - divHJ4.InnerHtml = "0"; - divHJ5.InnerHtml = "0"; - divHJ6.InnerHtml = "0"; + //divHJ1.InnerHtml = "0"; + //divHJ2.InnerHtml = "0"; + //divHJ3.InnerHtml = "0"; + //divHJ4.InnerHtml = "0"; + //divHJ5.InnerHtml = "0"; + //divHJ6.InnerHtml = "0"; } } #endregion @@ -413,18 +424,18 @@ namespace FineUIPro.Web.common //this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString(); if (project.EndDate.HasValue) { - this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate); + //this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate); int endDays = (project.EndDate.Value - DateTime.Now).Days; if (endDays >= 0) { - this.divRemainingDays.InnerHtml = endDays.ToString(); + //this.divRemainingDays.InnerHtml = endDays.ToString(); } if (project.StartDate.HasValue) { int pdays = (project.EndDate.Value - project.StartDate.Value).Days; if (pdays >= 0) { - this.divProjectDays.InnerHtml = pdays.ToString(); + //this.divProjectDays.InnerHtml = pdays.ToString(); } } } @@ -656,119 +667,119 @@ namespace FineUIPro.Web.common { var Pmodel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == ProjectId); //开工日期 - if (Pmodel.StartDate != null) - { - scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate); - if (!isBoolDates(Pmodel.StartDate)) - { - scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate0.Style.Add("color", "#FF7474"); - scheName0.Style.Add("color", "#FF7474"); - } - } - else - { - scheDate0.InnerText = ""; - } + //if (Pmodel.StartDate != null) + //{ + // scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate); + // if (!isBoolDates(Pmodel.StartDate)) + // { + // scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate0.Style.Add("color", "#FF7474"); + // scheName0.Style.Add("color", "#FF7474"); + // } + //} + //else + //{ + // scheDate0.InnerText = ""; + //} //竣工日期 - if (Pmodel.EndDate != null) - { - scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate); - if (!isBoolDates(Pmodel.EndDate)) - { - scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate7.Style.Add("color", "#FF7474"); - scheName7.Style.Add("color", "#FF7474"); - } - } - else - { - scheDate7.InnerText = ""; - } + //if (Pmodel.EndDate != null) + //{ + // scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate); + // if (!isBoolDates(Pmodel.EndDate)) + // { + // scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate7.Style.Add("color", "#FF7474"); + // scheName7.Style.Add("color", "#FF7474"); + // } + //} + //else + //{ + // scheDate7.InnerText = ""; + //} - if (scheduleList.Count > 0) - { - //节点1 - if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null) - { - scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate; - scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + //if (scheduleList.Count > 0) + //{ + // //节点1 + // //if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null) + // //{ + // // scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName; + // // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate; + // // scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate1.Style.Add("color", "#FF7474"); - scheName1.Style.Add("color", "#FF7474"); - } - } - //节点2 - if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null) - { - scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate; - scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + // // if (!isBoolDates(NowDate)) + // // { + // // scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // // scheDate1.Style.Add("color", "#FF7474"); + // // scheName1.Style.Add("color", "#FF7474"); + // // } + // //} + // //节点2 + // //if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null) + // //{ + // // scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName; + // // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate; + // // scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate2.Style.Add("color", "#FF7474"); - scheName2.Style.Add("color", "#FF7474"); - } - } - //节点3 - if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null) - { - scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate; - scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate3.Style.Add("color", "#FF7474"); - scheName3.Style.Add("color", "#FF7474"); - } - } - //节点4 - if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null) - { - scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate; - scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate4.Style.Add("color", "#FF7474"); - scheName4.Style.Add("color", "#FF7474"); - } - } - //节点5 - if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null) - { - scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate; - scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate5.Style.Add("color", "#FF7474"); - scheName5.Style.Add("color", "#FF7474"); - } - }//节点6 - if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null) - { - scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName; - var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate; - scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); - if (!isBoolDates(NowDate)) - { - scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; - scheDate6.Style.Add("color", "#FF7474"); - scheName6.Style.Add("color", "#FF7474"); - } - } - } + // // if (!isBoolDates(NowDate)) + // // { + // // scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // // scheDate2.Style.Add("color", "#FF7474"); + // // scheName2.Style.Add("color", "#FF7474"); + // // } + // //} + // //节点3 + // if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null) + // { + // scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName; + // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate; + // scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + // if (!isBoolDates(NowDate)) + // { + // scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate3.Style.Add("color", "#FF7474"); + // scheName3.Style.Add("color", "#FF7474"); + // } + // } + // //节点4 + // if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null) + // { + // scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName; + // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate; + // scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + // if (!isBoolDates(NowDate)) + // { + // scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate4.Style.Add("color", "#FF7474"); + // scheName4.Style.Add("color", "#FF7474"); + // } + // } + // //节点5 + // if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null) + // { + // scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName; + // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate; + // scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + // if (!isBoolDates(NowDate)) + // { + // scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate5.Style.Add("color", "#FF7474"); + // scheName5.Style.Add("color", "#FF7474"); + // } + // }//节点6 + // if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null) + // { + // scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName; + // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate; + // scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); + // if (!isBoolDates(NowDate)) + // { + // scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; + // scheDate6.Style.Add("color", "#FF7474"); + // scheName6.Style.Add("color", "#FF7474"); + // } + // } + //} } } diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs index 5c12744..09f8f84 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs @@ -59,303 +59,6 @@ namespace FineUIPro.Web.common /// protected global::System.Web.UI.WebControls.Label lbRemark; - /// - /// divProjectDays 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectDays; - - /// - /// divEndDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEndDate; - - /// - /// divRemainingDays 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRemainingDays; - - /// - /// scheline0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline0; - - /// - /// scheName0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName0; - - /// - /// scheDate0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate0; - - /// - /// scheline1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline1; - - /// - /// scheName1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName1; - - /// - /// scheDate1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate1; - - /// - /// scheline2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline2; - - /// - /// scheName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName2; - - /// - /// scheDate2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate2; - - /// - /// scheline3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline3; - - /// - /// scheName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName3; - - /// - /// scheDate3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate3; - - /// - /// scheline4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline4; - - /// - /// scheName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName4; - - /// - /// scheDate4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate4; - - /// - /// scheline5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline5; - - /// - /// scheName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName5; - - /// - /// scheDate5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate5; - - /// - /// scheline6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline6; - - /// - /// scheName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName6; - - /// - /// scheDate6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate6; - - /// - /// scheline7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline7; - - /// - /// scheName7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName7; - - /// - /// scheDate7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate7; - - /// - /// divHJ1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ1; - - /// - /// divHJ2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ2; - - /// - /// divHJ3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ3; - - /// - /// divHJ4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ4; - - /// - /// divHJ5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ5; - - /// - /// divHJ6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ6; - /// /// divCQMSAllNum 控件。 /// diff --git a/SGGL/FineUIPro.Web/res/css/base.css b/SGGL/FineUIPro.Web/res/css/base.css index 7f8490a..ff2f952 100644 --- a/SGGL/FineUIPro.Web/res/css/base.css +++ b/SGGL/FineUIPro.Web/res/css/base.css @@ -169,7 +169,7 @@ body, .wrap, .main { .image-full{ - background-size: 100%; + background-size: 100% 100%; background-position: center; background-repeat: no-repeat; } diff --git a/SGGL/FineUIPro.Web/res/css/mainindex.css b/SGGL/FineUIPro.Web/res/css/mainindex.css index 3235a73..b4ccd57 100644 --- a/SGGL/FineUIPro.Web/res/css/mainindex.css +++ b/SGGL/FineUIPro.Web/res/css/mainindex.css @@ -122,14 +122,14 @@ body::-webkit-scrollbar{ } .lw-tit>.lw-item{ width: 1.475rem; - height: .825rem; + height: 1rem; background-color: #254056; color: #ffffff; padding: .05rem; } .lw-tit > .lw-item > .lw-item-lab { - font-size: .175rem; - height: .25rem; + font-size: .25rem; + height: .5rem; color: #A9DDEE; border-bottom: 1px solid #00BEFF; width: 100%; @@ -143,11 +143,11 @@ body::-webkit-scrollbar{ .lw-tit > .lw-item > .lw-item-val { - height: calc(100% - .25rem); + height: calc(100% - .5rem); display: flex; align-items: center; justify-content: center; - font-size: .3rem; + font-size: .35rem; } .t-side>.t-side-tit{ height: .45rem; @@ -159,7 +159,7 @@ body::-webkit-scrollbar{ background-repeat: no-repeat; font-family: Alibaba PuHuiTi 2.0, Alibaba PuHuiTi 20; color: #FFFFFF; - font-size: .2rem; + font-size: .25rem; position: relative; } diff --git a/SGGL/FineUIPro.Web/res/css/projectIndex.css b/SGGL/FineUIPro.Web/res/css/projectIndex.css index f94a402..fd0f9b9 100644 --- a/SGGL/FineUIPro.Web/res/css/projectIndex.css +++ b/SGGL/FineUIPro.Web/res/css/projectIndex.css @@ -3,13 +3,13 @@ padding: .25rem; } -.side{ - width: calc((100% - 11.25rem) / 2); +.side { + width: calc((100% - 10rem) / 2); height: 100% } .center{ - width: 11.25rem; + width: 10rem; height: 100%; } .c_lang { @@ -19,11 +19,11 @@ } .side-tit { width: 100%; - height: .375rem; - font-size: .175rem; + height: .5rem; + font-size: .25rem; color: #ffffff; - padding-left: .375rem; - line-height: .375rem; + padding-left: .5rem; + line-height: .5rem; background-image: url(../images/z01.png); position: relative; } @@ -290,13 +290,13 @@ } .pro-d{ - width: 11.25rem; + width: 10rem; height: 5.75rem; padding: .125rem; position: relative; background-image: url(../images/m02.png); background-position: center; - background-size: 100%; + background-size: 100% 100%; background-repeat: no-repeat; } diff --git a/SGGL/Model/APIItem/HSSE/MeetingItem.cs b/SGGL/Model/APIItem/HSSE/MeetingItem.cs index d51ea42..cec8d16 100644 --- a/SGGL/Model/APIItem/HSSE/MeetingItem.cs +++ b/SGGL/Model/APIItem/HSSE/MeetingItem.cs @@ -236,5 +236,10 @@ namespace Model get; set; } + public string ClassMeetingDate + { + get; + set; + } } }