diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f605c87c..03454f87 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -2073,6 +2073,7 @@ + @@ -18010,6 +18011,13 @@ Video.aspx + + ToDoList.aspx + ASPXCodeBehind + + + ToDoList.aspx + AccidentCauseReportBar.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx index 7e715908..aaa58884 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx @@ -51,8 +51,16 @@ - - + + + + + + + + + + @@ -61,7 +69,7 @@ + FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="200px"> diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs index 0993fac4..0c0fe993 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs @@ -78,7 +78,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void BindGrid(int isPass = -1) { - var term = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); + var db = Funs.DB; + var term = db.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId); if (term != null) { lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "是" : "否"; @@ -87,8 +88,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } //获取子系统 var data = new List(); - var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList(); - if (list.Count > 0) + //var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList(); + var list = (from x in db.PreRun_SubInspectTermItem + join y in db.Sys_User on x.InspectedUser equals y.UserId + where x.SubInspectId == this.SubInspectId + select new + { + x.TermItemId, + x.SubItemId, + x.SubInspectId, + x.WorkInspectName, + x.InspectionResults, + x.InspectionIllustrate, + x.SubcontractorIsPass, + x.SubcontractorRemark, + x.ContractorIsPass, + x.ContractorRemark, + x.SupervisionIsPass, + x.SupervisionRemark, + x.OwnerIsPass, + x.OwnerRemark, + x.Sort, + InspectedUserName = y.UserName + } + ).OrderBy(z => z.Sort).ToList(); + + if (list.Count() > 0) { foreach (var item in list) { @@ -97,6 +122,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.SubItemId = item.SubItemId; model.SubInspectId = item.SubInspectId; model.WorkInspectName = item.WorkInspectName; + model.InspectedUserName = item.InspectedUserName; + model.InspectionResults = item.InspectionResults; model.ConfirmType = this.ConfirmType; model.InspectionIllustrate = item.InspectionIllustrate; model.ConfirmTypeName = this.ConfirmTypeName; @@ -127,6 +154,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun Grid1.DataSource = data; Grid1.DataBind(); titleName.Title = this.ConfirmType == 1 ? "分包商确认签字" : this.ConfirmType == 2 ? "承包商确认签字" : this.ConfirmType == 3 ? "监理确认签字" : this.ConfirmType == 4 ? "业主确认签字" : ""; + } /// @@ -139,6 +167,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun BindGrid(); } + /// + /// 检测结果 + /// + /// + public string Results(object value) + { + var result = string.Empty; + + if (value != null) + { + var intVal = int.Parse(value.ToString()); + if (intVal == 1) + { + result = "通过"; + } + else if (intVal == 0) + { + result = "未通过"; + } + } + + return result; + } #endregion #region 按钮和事件 @@ -765,6 +816,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 确认类型名称 /// public string ConfirmTypeName { get; set; } + public string InspectedUserName { get; set; } + + public int? InspectionResults { get; set; } /// /// 是否通过 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs index 367103cf..2ccb8720 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs @@ -122,6 +122,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Button btnSave; + /// + /// lblInspectionResults 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblInspectionResults; + /// /// rblIsPass 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index cd470971..6354c181 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -10,10 +10,26 @@ white-space: normal; word-break: break-all; } + .customlabel span { color: red; font-weight: bold; } + + .unconfirm span { + color: gray; + font-weight: bold; + } + + .notpass span { + color: red; + font-weight: bold; + } + + .pass span { + color: green; + font-weight: bold; + } @@ -107,15 +123,24 @@ - + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs index eeee3696..db63284e 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs @@ -261,6 +261,41 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ddlcbs.SelectedValue = subModel.Contractor; ddljl.SelectedValue = subModel.Supervision; ddlyz.SelectedValue = subModel.Owner; + + labSubcontractor.Hidden = false; + labSubcontractor.Text = subModel.SubcontractorIsAllPass == null ? "（待确认）" : subModel.SubcontractorIsAllPass == 0 ? "（不通过）" : subModel.SubcontractorIsAllPass == 1 ? "（通过）" : "（待确认）"; + labSubcontractor.CssClass = subModel.SubcontractorIsAllPass == null ? "unconfirm" : subModel.SubcontractorIsAllPass == 0 ? "notpass" : subModel.SubcontractorIsAllPass == 1 ? "pass" : "unconfirm"; + + labContractor.Hidden = false; + labContractor.Text = subModel.ContractorIsAllPass == null ? "（待确认）" : subModel.ContractorIsAllPass == 0 ? "（不通过）" : subModel.ContractorIsAllPass == 1 ? "（通过）" : "（待确认）"; + labContractor.CssClass = subModel.ContractorIsAllPass == null ? "unconfirm" : subModel.ContractorIsAllPass == 0 ? "notpass" : subModel.ContractorIsAllPass == 1 ? "pass" : "unconfirm"; + + labSupervision.Hidden = false; + labSupervision.Text = subModel.SupervisionIsAllPass == null ? "（待确认）" : subModel.SupervisionIsAllPass == 0 ? "（不通过）" : subModel.SupervisionIsAllPass == 1 ? "（通过）" : "（待确认）"; + labSupervision.CssClass = subModel.SupervisionIsAllPass == null ? "unconfirm" : subModel.SupervisionIsAllPass == 0 ? "notpass" : subModel.SupervisionIsAllPass == 1 ? "pass" : "unconfirm"; + + labOwner.Hidden = false; + labOwner.Text = subModel.OwnerIsAllPass == null ? "（待确认）" : subModel.OwnerIsAllPass == 0 ? "（不通过）" : subModel.OwnerIsAllPass == 1 ? "（通过）" : "（待确认）"; + labOwner.CssClass = subModel.OwnerIsAllPass == null ? "unconfirm" : subModel.OwnerIsAllPass == 0 ? "notpass" : subModel.OwnerIsAllPass == 1 ? "pass" : "unconfirm"; + + + //if (subModel.SubcontractorIsAllPass == null) + //{ + // labSupervision.Text = "（待确认）"; + // labSupervision.CssClass = "unconfirm"; + //} + //else if (subModel.SubcontractorIsAllPass == 0) + //{ + // labSupervision.Text = "（通过）"; + // labSupervision.CssClass = "notpass"; + //} + //else if (subModel.SubcontractorIsAllPass == 1) + //{ + // labSupervision.Text = "（不通过）"; + // labSupervision.CssClass = "pass"; + //} + + } else { diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs index 8d920894..cc928da4 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs @@ -230,15 +230,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Toolbar Toolbar2; - /// - /// ToolbarFill1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ToolbarFill ToolbarFill1; - /// /// ddlfbs 控件。 /// @@ -248,6 +239,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.DropDownList ddlfbs; + /// + /// labSubcontractor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label labSubcontractor; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// /// ddlcbs 控件。 /// @@ -257,6 +266,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.DropDownList ddlcbs; + /// + /// labContractor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label labContractor; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + /// /// ddljl 控件。 /// @@ -266,6 +293,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.DropDownList ddljl; + /// + /// labSupervision 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label labSupervision; + + /// + /// ToolbarFill2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill2; + /// /// ddlyz 控件。 /// @@ -274,5 +319,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlyz; + + /// + /// labOwner 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label labOwner; } } diff --git a/SGGL/FineUIPro.Web/Work/ToDoList.aspx b/SGGL/FineUIPro.Web/Work/ToDoList.aspx new file mode 100644 index 00000000..37518427 --- /dev/null +++ b/SGGL/FineUIPro.Web/Work/ToDoList.aspx @@ -0,0 +1,89 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ToDoList.aspx.cs" Inherits="FineUIPro.Web.Work.ToDoList" %> + + + + + + 工作待办 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/Work/ToDoList.aspx.cs b/SGGL/FineUIPro.Web/Work/ToDoList.aspx.cs new file mode 100644 index 00000000..15429b18 --- /dev/null +++ b/SGGL/FineUIPro.Web/Work/ToDoList.aspx.cs @@ -0,0 +1,195 @@ +using Aspose.Words; +using BLL; +using Model; +using Org.BouncyCastle.Asn1.Cms; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.Work +{ + public partial class ToDoList : PageBase + { + private static List toDoList = new List(); + + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //Funs.DropDownPageSize(this.ddlPageSize); + //if (this.CurrUser != null && this.CurrUser.PageSize.HasValue) + //{ + // Grid1.PageSize = this.CurrUser.PageSize.Value; + //} + //this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + + + // 绑定表格 + this.BindGrid(); + //////权限按钮方法 + //this.GetButtonPower(); + } + } + #endregion + + /// + /// 绑定数据 + /// + private void BindGrid() + { + toDoList.Clear(); + if (this.CurrUser.UserId != null && this.CurrUser.LoginProjectId != null) + { + #region 预试车管理-检查表条件确认 + + var list1 = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectedUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionResults == null).Select(p => p.SubInspectId).ToList(); + var num1 = list1.Distinct().Count(); + if (num1 > 0) + { + toDoList.Add(new WorkToDo { Id = Guid.NewGuid().ToString(), Num = num1, Title = "预试车管理-检查表条件确认", Detail = $"有{num1}个检查表条件待确认", PageUrl = "/TestRun/BeforeTestRun/SubWorkInspect.aspx", Memo = "" }); + } + + #endregion + + #region 预试车管理-检查表会签 + + var list2 = Funs.DB.PreRun_SubInspectTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionIsAllPass == 1 && ((x.Subcontractor == this.CurrUser.UserId && x.SubcontractorIsAllPass == null) || (x.Contractor == this.CurrUser.UserId && x.ContractorIsAllPass == null) || (x.Supervision == this.CurrUser.UserId && x.SupervisionIsAllPass == null) || (x.Owner == this.CurrUser.UserId && x.OwnerIsAllPass == null))).Select(p => p.SubInspectId).ToList(); + var num2 = list2.Distinct().Count(); + if (num2 > 0) + { + toDoList.Add(new WorkToDo { Id = Guid.NewGuid().ToString(), Num = num2, Title = "预试车管理-检查表会签", Detail = $"有{num2}个检查表会签待确认", PageUrl = "/TestRun/BeforeTestRun/InspectWanderAboutList.aspx", Memo = "" }); + } + + #endregion + + Grid1.RecordCount = toDoList.Count; + var table = this.LINQToDataTable(toDoList); + Grid1.DataSource = table; + Grid1.DataBind(); + + } + } + + + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "ToDo") + { + object[] keys = Grid1.DataKeys[e.RowIndex]; + string id = keys[0].ToString(); + var work = toDoList.Where(a => a.Id == id).FirstOrDefault(); + if (work != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(work.PageUrl, work.Title)); + } + } + } + + #region 关闭弹出窗 + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 排序 分页 + /// + /// + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + + + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + + this.BindGrid(); + //this.GetButtonPower(); + } + + + #endregion + + protected string ConvertTelephone(object WorkAreaId) + { + if (WorkAreaId != null) + return WorkAreaId.ToString(); + else + return ""; + } + + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Work/ToDoList.aspx.designer.cs b/SGGL/FineUIPro.Web/Work/ToDoList.aspx.designer.cs new file mode 100644 index 00000000..d078873c --- /dev/null +++ b/SGGL/FineUIPro.Web/Work/ToDoList.aspx.designer.cs @@ -0,0 +1,98 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Work +{ + + + public partial class ToDoList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index df69e968..69fbd111 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -181,11 +181,10 @@ /*.item-pbig { height: 45px; width: 1000px; - /*position:absolute; + position:absolute; left: 50%; - transform: translateX(-50%);*/ + transform: translateX(-50%); } - */ .up-wrap-ul li > div { @@ -238,23 +237,23 @@
- - - - + + + +
-
在建
-
停工
-
竣工
+
在建
+
停工
+
竣工
-
质量管理
-
安全管理
-
进度管理
-
焊接管理
-
材料管理
-
试车管理
+
质量管理
+
安全管理
+
进度管理
+
焊接管理
+
材料管理
+
试车管理
@@ -265,34 +264,58 @@
-
呼叫
- -
个人 +
+ +
+ 待办 + <%----%> + + <%--2--%> + +
+
+ 个人
-
设置
-
帮助 +
+
+ 设置 + +
+
+ 帮助
-
退出
-
全屏
+ + +
+
+ 退出 + +
+
全屏
-
移交管理
-
关键事项与协调沟通
-
视频监控
-
现场考勤
-
意见收集
- +
移交管理
+
关键事项与协调沟通
+
视频监控
+
现场考勤
+
意见收集
+
@@ -418,8 +441,12 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px"> - - + @@ -1037,6 +1064,12 @@ //window.open('https://www.baidu.com', '_blank'); $('[id$="_btnCall"]').click(); } + //待办 + function ToDo() { + // 弹出一个新窗口，加载指定的URL + //window.open('https://www.baidu.com', '_blank'); + $('[id$="_btnTodo"]').click(); + } diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index e44802bd..34278edd 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -891,5 +891,15 @@ namespace FineUIPro.Web protected void btnPhoneClick(object sender, EventArgs e) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ProjectData/ProjectUserContact.aspx"))); } + + /// + /// 待办 + /// + /// + /// + protected void btnTodo_OnClick(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Work/ToDoList.aspx"))); + } } } diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs index c8b0d732..02fc4ee1 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs @@ -86,6 +86,15 @@ namespace FineUIPro.Web /// protected global::FineUIPro.Button btnCall; + /// + /// btnTodo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnTodo; + /// /// btnPersonal 控件。 /// @@ -338,6 +347,15 @@ namespace FineUIPro.Web /// protected global::FineUIPro.Window Window1; + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + /// /// XmlDataSource1 控件。 /// diff --git a/SGGL/FineUIPro.Web/res/image/message.png b/SGGL/FineUIPro.Web/res/image/message.png new file mode 100644 index 00000000..63e24aec Binary files /dev/null and b/SGGL/FineUIPro.Web/res/image/message.png differ diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 843a4945..3bd8a400 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -241,6 +241,7 @@ + diff --git a/SGGL/Model/WorkToDo.cs b/SGGL/Model/WorkToDo.cs new file mode 100644 index 00000000..8ce24060 --- /dev/null +++ b/SGGL/Model/WorkToDo.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class WorkToDo + { + /// + /// Id + /// + public string Id { get; set; } + /// + /// 待办标题 + /// + public string Title { get; set; } + /// + /// 待办说明 + /// + public string Detail { get; set; } + /// + /// 数量 + /// + public int Num { get; set; } + /// + /// 跳转页面 + /// + public string PageUrl { get; set; } + /// + /// 其他 + /// + public string Memo { get; set; } + } +} diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 59ad2199..d989db4f 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true