lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2、五环，预试车管理，生成工作包检查表和检查表会签逻辑优化； 

3、五环，项目级补充待办
This commit is contained in:
夏菊 2025-01-08 14:51:16 +08:00
parent f7396815a0
commit f002af50a7
17 changed files with 732 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -2073,6 +2073,7 @@
<Content Include="Transfer\TelecomDataIn.aspx" />
<Content Include="Transfer\TelecomEdit.aspx" />
<Content Include="Video\Video.aspx" />
<Content Include="Work\ToDoList.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportImport.aspx" />
@ -18010,6 +18011,13 @@
<Compile Include="Video\Video.aspx.designer.cs">
<DependentUpon>Video.aspx</DependentUpon>
</Compile>
<Compile Include="Work\ToDoList.aspx.cs">
<DependentUpon>ToDoList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Work\ToDoList.aspx.designer.cs">
<DependentUpon>ToDoList.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\DataIn\AccidentCauseReportBar.aspx.cs">
<DependentUpon>AccidentCauseReportBar.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

14
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
View File

@ -51,8 +51,16 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="检查事项" ColumnID="WorkInspectName" DataField="WorkInspectName" SortField="WorkInspectName" Width="400px"></f:RenderField>
<f:RenderField HeaderText="检查说明" ColumnID="InspectionIllustrate" DataField="InspectionIllustrate" Width="200px"></f:RenderField>
<f:TemplateField Width="200px" HeaderText="签字确认" ColumnID="IsPass">
<f:RenderField HeaderText="检查人" ColumnID="InspectedUserName" DataField="InspectedUserName" Width="100px"></f:RenderField>
<f:TemplateField Width="100px" HeaderText="检查结果">
<ItemTemplate>
<asp:Label ID="lblInspectionResults" runat="server" Text='<%# Results(Eval("InspectionResults")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="检查说明" ColumnID="InspectionIllustrate" DataField="InspectionIllustrate" Width="200px"></f:RenderField>
<f:TemplateField Width="200px" HeaderText="会签确认" ColumnID="IsPass">
<ItemTemplate>
<asp:RadioButtonList runat="server" RepeatLayout="Flow" CssClass="ispass" RepeatDirection="Horizontal" ID="rblIsPass" AutoPostBack="true" OnSelectedIndexChanged="rblIsPass_SelectedIndexChanged">
<asp:ListItem Text="通过" Value="1" Selected="True"></asp:ListItem>
@ -61,7 +69,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="300px">
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="200px">
<Editor>
<f:TextBox runat="server" ID="txtRemark"></f:TextBox>
</Editor>

60
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs
View File

@ -78,7 +78,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
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<ConfirmIsPass>();
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 ? "业主确认签字" : "";
}
/// <summary>
@ -139,6 +167,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
BindGrid();
}
/// <summary>
/// 检测结果
/// </summary>
/// <returns></returns>
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
/// 确认类型名称
/// </summary>
public string ConfirmTypeName { get; set; }
public string InspectedUserName { get; set; }
public int? InspectionResults { get; set; }
/// <summary>
/// 是否通过
/// </summary>

9
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs generated
View File

@ -122,6 +122,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// lblInspectionResults 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblInspectionResults;
/// <summary>
/// rblIsPass 控件。
/// </summary>

27
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx
View File

@ -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;
}
</style>
</head>
<body>
@ -107,15 +123,24 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Bottom" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlfbs" Required="true" EnableEdit="true" Label="施工分包商" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labSubcontractor" Hidden="true"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlcbs" Required="true" EnableEdit="true" Label="承包商" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labContractor" Hidden="true"></f:Label>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Bottom" runat="server">
<Items>
<f:DropDownList ID="ddljl" Required="true" EnableEdit="true" Label="监理" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labSupervision" Hidden="true"></f:Label>
<f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlyz" Required="true" EnableEdit="true" Label="业主" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labOwner" Hidden="true"></f:Label>
</Items>
</f:Toolbar>
</Toolbars>

35
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
View File

@ -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
{

72
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs generated
View File

@ -230,15 +230,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// ddlfbs 控件。
/// </summary>
@ -248,6 +239,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddlfbs;
/// <summary>
/// labSubcontractor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labSubcontractor;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// ddlcbs 控件。
/// </summary>
@ -257,6 +266,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddlcbs;
/// <summary>
/// labContractor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labContractor;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// ddljl 控件。
/// </summary>
@ -266,6 +293,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddljl;
/// <summary>
/// labSupervision 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labSupervision;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// ddlyz 控件。
/// </summary>
@ -274,5 +319,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlyz;
/// <summary>
/// labOwner 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labOwner;
}
}

89
SGGL/FineUIPro.Web/Work/ToDoList.aspx Normal file
View File

@ -0,0 +1,89 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ToDoList.aspx.cs" Inherits="FineUIPro.Web.Work.ToDoList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>工作待办</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.red {
background-color: #FF7575;
background-image: none;
}
.fontred {
color: #FF7575;
background-image: none;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工作待办"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="false" ForceFit="true"
DataKeyNames="Id" AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id"
AllowSorting="false" SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="false" IsDatabasePaging="false" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
<Toolbars>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="Title" DataField="Title" SortField="Title"
FieldType="String" HeaderText="待办模块" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Detail" DataField="Detail" SortField="Detail"
FieldType="String" HeaderText="待办说明" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Num" DataField="Num" SortField="Num"
FieldType="String" HeaderText="待办数量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" CommandName="ToDo" Text="详情" />
</Columns>
<Listeners>
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
Title="代办处理" EnableIFrame="true" Height="680px"
Width="1420px">
</f:Window>
</form>
</body>
</html>

195
SGGL/FineUIPro.Web/Work/ToDoList.aspx.cs Normal file
View File

@ -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<WorkToDo> toDoList = new List<WorkToDo>();
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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
/// <summary>
/// 绑定数据
/// </summary>
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 关闭弹出窗
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region 排序 分页
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid();
}
#endregion
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private void GetButtonPower()
{
if (Request.Params["value"] == "0")
{
return;
}
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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 "";
}
}
}

98
SGGL/FineUIPro.Web/Work/ToDoList.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Work
{
public partial class ToDoList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

117
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -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 @@
<div class="nav-left">
<div class="nav-btn t-btns p-t-btns">
<div class="projectSelect">
<f:DropDownList runat="server" Width="250px" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
AutoPostBack="true" EnableEdit="true" CssClass="">
</f:DropDownList>
<f:DropDownList runat="server" Width="250px" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
AutoPostBack="true" EnableEdit="true" CssClass="">
</f:DropDownList>
</div>
<div class="t-btn t-btn-act" onclick="ProjectZJClick();" style="cursor:pointer">在建</div>
<div class="t-btn" onclick="ProjectTGClick();" style="cursor:pointer">停工</div>
<div class="t-btn" onclick="ProjectJGClick();" style="cursor:pointer">竣工</div>
<div class="t-btn t-btn-act" onclick="ProjectZJClick();" style="cursor: pointer">在建</div>
<div class="t-btn" onclick="ProjectTGClick();" style="cursor: pointer">停工</div>
<div class="t-btn" onclick="ProjectJGClick();" style="cursor: pointer">竣工</div>
</div>
<div class="nav-btn n-btns-l">
<div class="n-btn-l p-n-btn-l" onclick="CQMSClick();" style="cursor:pointer">质量管理</div>
<div class="n-btn-l p-n-btn-l" onclick="HSSEClick();" style="cursor:pointer">安全管理</div>
<div class="n-btn-l p-n-btn-l" onclick="JDGLClick();" style="cursor:pointer">进度管理</div>
<div class="n-btn-l p-n-btn-l" onclick="HJGLClick();" style="cursor:pointer">焊接管理</div>
<div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor:pointer">材料管理</div>
<div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor:pointer">试车管理</div>
<div class="n-btn-l p-n-btn-l" onclick="CQMSClick();" style="cursor: pointer">质量管理</div>
<div class="n-btn-l p-n-btn-l" onclick="HSSEClick();" style="cursor: pointer">安全管理</div>
<div class="n-btn-l p-n-btn-l" onclick="JDGLClick();" style="cursor: pointer">进度管理</div>
<div class="n-btn-l p-n-btn-l" onclick="HJGLClick();" style="cursor: pointer">焊接管理</div>
<div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor: pointer">材料管理</div>
<div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor: pointer">试车管理</div>
</div>
</div>
<div class="nav-center">
@ -265,34 +264,58 @@
</div>
<div class="nav-right">
<div class="btns t-btns t-btn-r">
<div class=" t-btn1 iconfont" onclick="CallFunction()" style="cursor: pointer"><span>呼叫<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnPhoneClick" ToolTip="呼叫" Hidden="true"
<div class=" t-btn1 iconfont icon-phone" onclick="CallFunction()" style="cursor: pointer">
<span>呼叫<f:Button runat="server" CssClass="bgbtntop" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="呼叫" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
</f:Button></span></div>
<div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer"><span>个人<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="true"
</f:Button>
</span>
</div>
<div class="t-btn1 iconfont icon-phone" onclick="ToDo()" style="cursor: pointer">
<span>待办<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnTodo_OnClick" ToolTip="待办" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnTodo" OnClientClick="parent.removeActiveTab();">
</f:Button>
<%--<f:Button ID="btnTodo" IconUrl="~/res/image/message.png" CssClass="bgbtntop" runat="server" OnClick="btnTodo_OnClick" />--%>
</span>
<%--<span id="notification-badge" class="notification-badge" >2</span>--%>
<span id="notification-badge" class=" notification-badge" style="display: none;">0</span>
</div>
<div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer">
<span>个人<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
</f:Button></span></div>
<div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor: pointer"><span>设置<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnProjectSet_Click" ToolTip="项目设置" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnProjectSet" OnClientClick="parent.removeActiveTab();">
</f:Button></span></div>
<div class="t-btn1 iconfont icon-bangzhu" onclick="HelpFunction()" style="cursor: pointer"><span>帮助<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnHelp_Click" ToolTip="帮助" Hidden="true"
</f:Button>
</span>
</div>
<div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor: pointer">
<span>设置<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnProjectSet_Click" ToolTip="项目设置" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnProjectSet" OnClientClick="parent.removeActiveTab();">
</f:Button>
</span>
</div>
<div class="t-btn1 iconfont icon-bangzhu" onclick="HelpFunction()" style="cursor: pointer">
<span>帮助<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnHelp_Click" ToolTip="帮助" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHelp" OnClientClick="parent.removeActiveTab();">
</f:Button></span></div>
<div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer"><span>退出<f:Button runat="server" CssClass="bgbtntop" Text="退出" ToolTip="退出" IconFont="PowerOff" Hidden="true"
EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
<Listeners>
<f:Listener Event="click" Handler="onToolSignOutClick" />
</Listeners>
</f:Button></span></div>
<div class="t-btn1 iconfont icon-quanping_o ab" style="cursor:pointer"><span>全屏</span></div>
</f:Button>
</span>
</div>
<div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
<span>退出<f:Button runat="server" CssClass="bgbtntop" Text="退出" ToolTip="退出" IconFont="PowerOff" Hidden="true"
EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
<Listeners>
<f:Listener Event="click" Handler="onToolSignOutClick" />
</Listeners>
</f:Button>
</span>
</div>
<div class="t-btn1 iconfont icon-quanping_o ab" style="cursor: pointer"><span>全屏</span></div>
</div>
<div class="nav-btn n-btns-r">
<div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor:pointer">移交管理</div>
<div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor:pointer;width: 2.225rem;height: .305rem;line-height: .35rem;">关键事项与协调沟通</div>
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor:pointer">视频监控</div>
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor:pointer">现场考勤</div>
<div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor:pointer">意见收集</div>
<div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor:pointer; display:none">协调与沟通</div>
<div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor: pointer">移交管理</div>
<div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor: pointer; width: 2.225rem; height: .305rem; line-height: .35rem;">关键事项与协调沟通</div>
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">视频监控</div>
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">现场考勤</div>
<div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor: pointer">意见收集</div>
<div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor: pointer; display: none">协调与沟通</div>
</div>
</div>
</div>
@ -418,8 +441,12 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="Window1" Title="呼叫" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="呼叫" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="700px">
</f:Window>
<f:Window ID="Window2" Title="待办" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="700px">
</f:Window>
@ -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();
}
</script>
</body>
</html>

10
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -891,5 +891,15 @@ namespace FineUIPro.Web
protected void btnPhoneClick(object sender, EventArgs e) {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ProjectData/ProjectUserContact.aspx")));
}
/// <summary>
/// 待办
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnTodo_OnClick(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Work/ToDoList.aspx")));
}
}
}

18
SGGL/FineUIPro.Web/indexProject.aspx.designer.cs generated
View File

@ -86,6 +86,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Button btnCall;
/// <summary>
/// btnTodo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTodo;
/// <summary>
/// btnPersonal 控件。
/// </summary>
@ -338,6 +347,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// XmlDataSource1 控件。
/// </summary>

BIN
SGGL/FineUIPro.Web/res/image/message.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 532 B

1
SGGL/Model/Model.csproj
View File

@ -241,6 +241,7 @@
<Compile Include="APIItem\ResponeData.cs" />
<Compile Include="SpTDesktopItem.cs" />
<Compile Include="TestRun\DriverSub\DriverSubEvaluationData.cs" />
<Compile Include="WorkToDo.cs" />
<Compile Include="TokenItem.cs" />
<Compile Include="ZHGL\DataSync\AccidentOutput.cs" />
<Compile Include="ZHGL\DataSync\BaseEntities.cs" />

36
SGGL/Model/WorkToDo.cs Normal file
View File

@ -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
{
/// <summary>
/// Id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 待办标题
/// </summary>
public string Title { get; set; }
/// <summary>
/// 待办说明
/// </summary>
public string Detail { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Num { get; set; }
/// <summary>
/// 跳转页面
/// </summary>
public string PageUrl { get; set; }
/// <summary>
/// 其他
/// </summary>
public string Memo { get; set; }
}
}

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />