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

20250329 工作台

This commit is contained in:
毕文静 2025-03-29 00:01:50 +08:00
parent 2d5e6785f1
commit 70169120e3
27 changed files with 770 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
View File

@ -238,7 +238,7 @@ SELECT InspectionPersonId AS DataId
,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Person.ProjectId=@projectId and (Person.IsOnSite=1 or Person.DepartureTime is not null) and
WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate
UNION ALL
SELECT InspectionPersonId AS DataId
@ -252,7 +252,7 @@ SELECT InspectionPersonId AS DataId
,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Person.ProjectId=@projectId and (Person.IsOnSite=1 or Person.DepartureTime is not null) and
WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
Person.ValidityDate<getdate()
UNION ALL
SELECT InspectionMachineId AS DataId
@ -266,7 +266,7 @@ SELECT InspectionMachineId AS DataId
,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Machine.ProjectId=@projectId and (Machine.IsOnSite=1 or Machine.LeaveDate is not null) and
WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate
UNION ALL
SELECT InspectionMachineId AS DataId
@ -280,7 +280,7 @@ SELECT InspectionMachineId AS DataId
,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Machine.ProjectId=@projectId and (Machine.IsOnSite=1 or Machine.LeaveDate is not null) and
WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
Machine.NextTestDate<getdate()
UNION ALL
SELECT distinct Project.ProjectId AS DataId

50
DataBase/版本日志/SUBQHSE_V2025-03-25-bwj.sql → DataBase/版本日志/SUBQHSE_V2025-03-28-bwj.sql
View File

@ -9,7 +9,7 @@ BEGIN
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待整改' AS MenuName
,project.ProjectName
,project.ProjectCode
,register.RegisterDef AS Content
,users.UserId
,users.UserName
@ -28,7 +28,7 @@ UNION ALL
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待确认' AS MenuName
,project.ProjectName
,project.ProjectCode
,register.RegisterDef AS Content
,users.UserId
,users.UserName
@ -46,7 +46,7 @@ UNION ALL
SELECT CheckControlCode AS DataId
,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
,'质量巡检待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,checkControl.QuestionDef AS Content
,users.UserId
,users.UserName
@ -64,7 +64,7 @@ UNION ALL
SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,GJSX.Detail AS Content
,users.UserId
,users.UserName
@ -84,7 +84,7 @@ UNION ALL
SELECT ConstructSolutionId AS DataId
,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
,'施工方案待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,Solution.SolutionName AS Content
,users.UserId
,users.UserName
@ -110,7 +110,7 @@ UNION ALL
SELECT InspectionId AS DataId
,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
,'共检通知单待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,InspectionManagement.AcceptanceSite AS Content
,users.UserId
,users.UserName
@ -127,7 +127,7 @@ UNION ALL
SELECT CheckSpecialId AS DataId
,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
,'专项检查' AS MenuName
,project.ProjectName
,project.ProjectCode
,CheckItemSet.CheckItemName AS Content
,users.UserId
,users.UserName
@ -146,7 +146,7 @@ UNION ALL
SELECT CheckColligationId AS DataId
,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
,'综合检查待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,case CheckType when '0' then '周检' when '1' then '月检' else '其它' end AS Content
,users.UserId
,users.UserName
@ -166,7 +166,7 @@ UNION ALL
SELECT PatrolPlanId AS DataId
,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
,'风险巡检待处理' AS MenuName
,project.ProjectName
,project.ProjectCode
,HazardListItem.HazardItems AS Content
,users.UserId
,users.UserName
@ -187,7 +187,7 @@ UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'天过期' AS MenuName
,project.ProjectName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
@ -207,7 +207,7 @@ UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质已过期'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'天' AS MenuName
,project.ProjectName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
@ -226,14 +226,14 @@ Person.ProjectId =projectUser.ProjectId
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'天过期 '+Person.PersonName AS MenuName
,project.ProjectName
,'人员报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'天过期 ' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?InspectionPersonId='+Person.InspectionPersonId AS PCUrl
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
@ -246,14 +246,14 @@ and project.ProjectState='1'
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验已过期'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'天 '+Person.PersonName AS MenuName
,project.ProjectName
,'人员报验已过期'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'天 ' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?InspectionPersonId='+Person.InspectionPersonId AS PCUrl
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
@ -266,14 +266,14 @@ and project.ProjectState='1'
UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'天过期 '+Machine.InspectionMachineName AS MenuName
,project.ProjectName
,'机具报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'天过期 ' AS MenuName
,project.ProjectCode
,Machine.InspectionMachineName AS Content
,users.UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
@ -286,13 +286,13 @@ UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验已过期'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'天' AS MenuName
,project.ProjectName
,project.ProjectCode
,Machine.InspectionMachineName AS Content
,users.UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId =projectUser.UserId
@ -304,7 +304,7 @@ UNION ALL
SELECT distinct Project.ProjectId AS DataId
,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
,'本月工程量完成情况尚未填报' AS MenuName
,Project.ProjectName
,project.ProjectCode
,'' AS Content
,users.UserId
,users.UserName
@ -321,7 +321,7 @@ UNION ALL
SELECT MonthPlan.MonthPlanId AS DataId
,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
,'月度计划尚未完成' AS MenuName
,project.ProjectName
,project.ProjectCode
,'' AS Content
,users.UserId
,users.UserName
@ -337,7 +337,7 @@ DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GE
and MonthPlan.ProjectId = projectUser.ProjectId
and (@sType='1' or @sType='2')
--ORDER BY DataTime DESC
ORDER BY DataTime DESC
END

2
SGGL/BLL/.vs/BLL.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

12
SGGL/BLL/HSSE/SitePerson/PersonService.cs
View File

@ -983,5 +983,17 @@ namespace BLL
}
return passWord;
}
public static Model.SitePerson_Person GetPersonImgByIdentityCard(string identityCard)
{
if (!string.IsNullOrEmpty(identityCard))
{
return Funs.DB.SitePerson_Person.FirstOrDefault(e => e.IdentityCard == identityCard);
}
else
{
return null;
}
}
}
}

22
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
View File

@ -34,8 +34,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
if (!IsPostBack)
{
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
GetButtonPower();
//工作台待办
string projectId = Request.Params["projectId"];
if (!string.IsNullOrEmpty(projectId))
{
BLL.UnitService.InitUnitDownList(this.drpUnitId, projectId, true);
}
else
{
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
}
if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_CWCEC)
{
@ -480,6 +489,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.btnSave.Hidden = false;
}
}
else
{
//工作台待办
string projectId = Request.Params["projectId"];
if (!string.IsNullOrEmpty(projectId))
{
this.btnSave.Hidden = false;
}
}
}
#endregion
}

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

@ -1727,6 +1727,7 @@
<Content Include="res\assets\iconfont\iconfont.css" />
<Content Include="res\assets\image\bj1.jpg" />
<Content Include="res\assets\image\bj2.jpg" />
<Content Include="res\assets\image\changeProject.png" />
<Content Include="res\assets\image\index1\aqhysj.png" />
<Content Include="res\assets\image\index1\arrL.png" />
<Content Include="res\assets\image\index1\arrR.png" />

22
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
View File

@ -23,13 +23,14 @@
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableCheckBoxSelect="true" EnableMultiSelect="true" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Label ID="lbltip" runat="server" Text="提示：勾选确定筛选看板数据"></f:Label>
<f:RadioButtonList runat="server" ID="ckState" AutoPostBack="true"
OnSelectedIndexChanged="TextBox_TextChanged" Width="280px">
<f:RadioItem Text="全部" Value="0" />
<%--<f:RadioItem Text="全部" Value="0" />--%>
<f:RadioItem Text="在建" Value="1" Selected="true" />
<f:RadioItem Text="停工" Value="2" />
<f:RadioItem Text="竣工" Value="3" />
@ -41,6 +42,7 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnSure" runat="server" Text="确定" ToolTip="筛选集团看板数据" OnClick="btnSure_Click" Icon="Accept"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@ -51,10 +53,10 @@
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
<f:RenderField Width="90px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
HeaderText="项目代号">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
<f:RenderField Width="600px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ProjectTypeName" DataField="ProjectTypeName" SortField="ProjectTypeName"
@ -63,31 +65,31 @@
<f:RenderField Width="90px" ColumnID="ProjectStateName2" DataField="ProjectStateName2" SortField="ProjectStateName2"
FieldType="String" HeaderText="细分状态" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="110px" ColumnID="ProjectMoney" DataField="ProjectMoney"
<%-- <f:RenderField Width="110px" ColumnID="ProjectMoney" DataField="ProjectMoney"
FieldType="String" HeaderText="合同额(万元)" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ConstructionMoney" DataField="ConstructionMoney"
FieldType="String" HeaderText="施工合同额(万元)" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</f:RenderField>--%>
<f:TemplateField ColumnID="tfCM" Width="85px" HeaderText="施工经理" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lblCM" runat="server" Text='<%# ConvertConstructionManager(Eval("ProjectId")) %>'
ToolTip='<%# ConvertConstructionManager(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="tfSubcontractor" Width="400px" HeaderText="施工分包商" HeaderTextAlign="Center" TextAlign="Left">
<%--<f:TemplateField ColumnID="tfSubcontractor" Width="400px" HeaderText="施工分包商" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lblSubcontractor" runat="server" Text='<%# ConvertSubcontractor(Eval("ProjectId")) %>'
ToolTip='<%# ConvertSubcontractor(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="tfOwn" Width="150px" HeaderText="建设单位" HeaderTextAlign="Center" TextAlign="Left">
</f:TemplateField>--%>
<f:TemplateField ColumnID="tfOwn" Width="280px" HeaderText="建设单位" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lblOwn" runat="server" Text='<%# ConvertOwn(Eval("ProjectId")) %>'
ToolTip='<%# ConvertOwn(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
<f:RenderField Width="450px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
HeaderText="项目地址" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"

62
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using NPOI.POIFS.Storage;
using System;
using System.Collections.Generic;
using System.Data;
@ -10,6 +11,18 @@ namespace FineUIPro.Web.ProjectData
{
public partial class ProjectList : PageBase
{
public string projectLists
{
get
{
return (string)ViewState["projectLists"];
}
set
{
ViewState["projectLists"] = value;
}
}
#region 加载
/// <summary>
/// 加载页面
@ -17,7 +30,7 @@ namespace FineUIPro.Web.ProjectData
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
{
if (!IsPostBack)
{
////权限按钮方法
@ -26,8 +39,12 @@ namespace FineUIPro.Web.ProjectData
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
Grid1.PageSize = this.CurrUser.PageSize.Value;
}
}
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
{
projectLists = CurrUser.CompanyProjectId;
}
// 绑定表格
this.BindGrid();
}
@ -43,11 +60,11 @@ namespace FineUIPro.Web.ProjectData
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+ @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2"
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+ @" WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim()))
{
strSql += " AND ProjectName LIKE @ProjectName";
@ -69,9 +86,14 @@ namespace FineUIPro.Web.ProjectData
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
if (!string.IsNullOrEmpty(projectLists))
{
Grid1.SelectedRowIDArray = projectLists.Split(',').ToArray();
}
}
#endregion
@ -151,7 +173,7 @@ namespace FineUIPro.Web.ProjectData
}
}
#endregion
#region 查询
/// <summary>
/// 查询
@ -160,6 +182,14 @@ namespace FineUIPro.Web.ProjectData
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(projectLists))
{
projectLists = projectLists + "," + string.Join(",", this.Grid1.SelectedRowIDArray);
}
else
{
projectLists = string.Join(",", this.Grid1.SelectedRowIDArray);
}
this.BindGrid();
}
#endregion
@ -185,7 +215,7 @@ namespace FineUIPro.Web.ProjectData
string unitName = string.Empty;
if (projectId != null)
{
unitName =ProjectService.getProjectUnitNameByUnitType(projectId.ToString(), Const.ProjectUnitType_2);
unitName = ProjectService.getProjectUnitNameByUnitType(projectId.ToString(), Const.ProjectUnitType_2);
}
return unitName;
}
@ -235,5 +265,23 @@ namespace FineUIPro.Web.ProjectData
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
protected void btnSure_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(projectLists))
{
CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray) + "," + projectLists;
}
else
{
CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray);
}
PageContext.Redirect("~/index.aspx", "_top");
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
}
}
}

73
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData {
public partial class ProjectList {
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectList
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -56,7 +58,16 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lbltip 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbltip;
/// <summary>
/// ckState 控件。
/// </summary>
@ -65,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList ckState;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@ -74,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -83,7 +94,16 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnSure 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSure;
/// <summary>
/// labNumber 控件。
/// </summary>
@ -92,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// lblCM 控件。
/// </summary>
@ -101,16 +121,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCM;
/// <summary>
/// lblSubcontractor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblSubcontractor;
/// <summary>
/// lblOwn 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblOwn;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -128,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -137,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -146,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -155,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -164,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnEnter 控件。
/// </summary>
@ -173,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnEnter;
/// <summary>
/// btnView 控件。
/// </summary>

271
SGGL/FineUIPro.Web/WorkBench.aspx
View File

@ -10,6 +10,18 @@
<link href="res/largescreen/css/userPage.css" rel="stylesheet" />
<script src="res/largescreen/libs/flex.js"></script>
<script src="res/largescreen/libs/jquery.js"></script>
<link href="res/css/company.css" rel="stylesheet" />
<style type="text/css">
#mybtn {
width: 1rem;
height:.300rem;
line-height:.300rem;
border-radius:20px;
background:blue;
color:#fff;
text-align:center;
}
</style>
</head>
<body style="overflow: auto;">
<form id="form1" runat="server">
@ -41,9 +53,12 @@
<f:ListItem Text="English" Value="en-US" />
</f:DropDownList>
</div>
<div class="user">
<asp:Literal runat="server" ID="lName" />
</div>
<div class="user" onclick="PersonalFunction()" style="cursor:pointer;" >
<asp:Literal runat="server" ID="lName" />
<f:Button runat="server" ID="btnPersonal" OnClick="btnPersonal_Click" Hidden="true"></f:Button>
</div>
<div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
</div>
</div>
</div>
@ -51,7 +66,7 @@
<div class="z-info">
<div class="z-profile">
<div class="z-img">
<img src="res/largescreen/images/LoginPic.png" />
<img id="imgPic" runat="server" src="res/largescreen/images/LoginPic.jpg" />
</div>
<h2>
<asp:Literal runat="server" ID="lblName" /></h2>
@ -90,136 +105,40 @@
<div class="z-a">
<div class="z-b">
<div class="z-box1">
<div class="z-box1-tit">
<div class="z-box1-text">待办预警</div>
<div class="z-boxone">
<div class="z-boxone-tit">
<div class="z-boxone-text">待办预警</div>
<div class="z-tabs">
<div class="tab tab-a" onclick="getToDo(1);" style="cursor: pointer">全部</div>
<f:Button runat="server" ID="btnAll" OnClick="btnAll_Click" Hidden="true"></f:Button>
<div class="tab" onclick="getToDo(2);" style="cursor: pointer">待办</div>
<f:Button runat="server" ID="btnTo" OnClick="btnTo_Click" Hidden="true"></f:Button>
<div class="tab" onclick="getToDo(3);" style="cursor: pointer">预警</div>
<f:Button runat="server" ID="btnDo" OnClick="btnDo_Click" Hidden="true"></f:Button>
<f:HiddenField ID="hdToDoState" runat="server"></f:HiddenField>
<div class="tab tab-a" onclick="getToDo(1);" style="cursor: pointer">全部</div>
<div class="tab" onclick="getToDo(2);" style="cursor: pointer">待办</div>
<div class="tab" onclick="getToDo(3);" style="cursor: pointer">预警 </div>
</div>
</div>
<div class="z-main">
<ul>
<li>
<div style="width: 100%;height:100%">
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="待办预警" ShowGridHeader="false"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataTimeStr" SortDirection="DESC"
OnSort="Grid2_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="7" OnPageIndexChange="Grid2_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid2_RowDoubleClick" EnableTextSelection="True" Height="320px">
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="30px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="800px" ColumnID="MenuName" DataField="MenuName" SortField="MenuName"
FieldType="String" HeaderText="事项" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="DataTimeStr" DataField="DataTimeStr" SortField="DataTimeStr"
FieldType="String" HeaderText="日期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PCUrl" DataField="PCUrl" SortField="PCUrl"
FieldType="String" HeaderText="连接地址" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
</f:RenderField>
</Columns>
<%--<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>--%>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
</f:ToolbarSeparator>
</PageItems>
</f:Grid>
</div>
</li>
</ul>
<div class="z-main">
<div class="z-boxtwo" id="divdbyj">
</div>
</div>
</div>
<div class="z-box1">
<div class="z-box1-tit">
<div class="z-box1-text">通知公告</div>
<div class="z-boxone">
<div class="z-boxone-tit">
<div class="z-boxone-text">通知公告</div>
</div>
<div class="z-main">
<ul>
<li>开发中
</li>
</ul>
<%--<div class="paging note">
<div class="total">共23条</div>
<div class="page">
<div class="prev" data-type='1'></div>
<div class="page-num-box page1"></div>
<div class="next" data-type='1'></div>
</div>
</div>--%>
<div class="z-boxtwo" id="divNotice">开发中</div>
</div>
</div>
</div>
<div class="z-box">
<div class="z-box1-tit">
<div class="z-box1-text">我的项目</div>
<div class="z-boxone-tit">
<div class="z-boxone-text">我的项目</div>
<div class="z-tabs">
<div class="tab tab-a" onclick="getProject(1);" style="cursor: pointer">在建</div>
<f:Button runat="server" ID="zjProject" OnClick="zjProject_Click" Hidden="true"></f:Button>
<div class="tab" onclick="getProject(2);" style="cursor: pointer">暂停</div>
<f:Button runat="server" ID="ztProject" OnClick="ztProject_Click" Hidden="true"></f:Button>
<div class="tab" onclick="getProject(3);" style="cursor: pointer">完工</div>
<f:Button runat="server" ID="wgProject" OnClick="wgProject_Click" Hidden="true"></f:Button>
<f:HiddenField ID="hdState" runat="server"></f:HiddenField>
<div class="tab" onclick="getProject(2);" style="cursor: pointer">暂停</div>
<div class="tab" onclick="getProject(3);" style="cursor: pointer">完工</div>
</div>
</div>
<div class="z-main">
<ul>
<li>
<div style="width: 100%">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目信息" ShowGridHeader="false"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="5" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" Height="320px">
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="tfImageUrl3" Width="50px" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl3" runat="server" Text='<%# ConvertProjectImage(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String" HeaderTextAlign="Center"
HeaderText="项目代号">
</f:RenderField>--%>
<f:RenderField Width="800px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField Width="90px" TextAlign="Center" Text="进入项目" CommandName="LoginProject" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
</PageItems>
</f:Grid>
</div>
</li>
</ul>
<div id="divProject" class="z-boxtwo"></div>
</div>
</div>
</div>
@ -228,39 +147,45 @@
</f:ContentPanel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="待办预警" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px"
Height="550px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnEnter" EnablePostBack="true" runat="server" Icon="Outline" Text="进入项目"
OnClick="btnEnter_Click">
</f:MenuButton>
</f:Menu>
<input type="hidden" id="hiddenUrl" value="" runat="server" />
<f:Button runat="server" OnClick="btnshowWindows" ToolTip="打开代办" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnShowWindows">
</f:Button>
<f:Window ID="Window1" Title="待办预警" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px"
Height="550px">
</f:Window>
<f:Window ID="Window2" Title="个人信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px"
Height="550px">
</f:Window>
</form>
</body>
</html>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
<script type="text/javascript" >
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
//弹框代办
function returnWindows(objUrl) {
document.getElementById("hiddenUrl").value = objUrl;
$('#btnShowWindows').click();
}
//我的
function PersonalFunction() {
$('[id$="_btnPersonal"]').click();
}
//退出
function SignOutFunction() {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { window.open('login.aspx', '_top'); }
}
var gjskbClientID = '<%= gsjkb.ClientID %>';
var rwzxClientID = '<%= rwzx.ClientID %>';
var xtglClientID = '<%= xtgl.ClientID %>';
var zjProjectClientID = '<%= zjProject.ClientID %>';
var ztProjectClientID = '<%= ztProject.ClientID%>';
var wgProjectClientID = '<%= wgProject.ClientID%>';
var btnAllClientID = '<%= btnAll.ClientID%>';
var btnToClientID = '<%= btnTo.ClientID%>';
var btnDoClientID = '<%= btnDo.ClientID%>';
function gsjkbClick() {
F(gjskbClientID).click();
@ -271,27 +196,57 @@
function xtglClick() {
F(xtglClientID).click();
}
//当前登录人Id
var userId = '<%=UserId%>';
// 进入页面加载全部
window.onload = function () {
getToDo(1)
getProject(1)
}
//我的项目
function getProject(projectState) {
if (projectState == 1) {
F(zjProjectClientID).click();
} else if (projectState == 2) {
F(ztProjectClientID).click();
} else if (projectState == 3) {
F(wgProjectClientID).click();
}
$.ajax({
type: "POST",
url: "WorkBench.aspx/getProject",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
proState: projectState,
userId: userId
}),
success: function (response) {
console.log(response.d)
console.log($('#divProject'))
$('#divProject').html(response.d)
},
error: function (xhr, status, error) {
console.log(error)
}
});
}
//待办预警
function getToDo(sType) {
if (sType == 1) {
F(btnAllClientID).click();
} else if (sType == 2) {
F(btnToClientID).click();
} else if (sType == 3) {
F(btnDoClientID).click();
}
$.ajax({
type: "POST",
url: "WorkBench.aspx/getGztm",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
sType: sType,
userId: userId
}),
success: function (response) {
console.log(response.d)
console.log($('#divdbyj'))
$('#divdbyj').html(response.d)
},
error: function (xhr, status, error) {
console.log(error)
}
});
}
</script>
</script>
</html>
<script>
$(document).ready(function () {
let toDoIdx = 0
@ -326,7 +281,7 @@
}
})
page(26, '.todo', 0)
page(9, '.todo', 0)
page(40, '.project', 2)
page(30, '.note', 1)
// 翻页

448
SGGL/FineUIPro.Web/WorkBench.aspx.cs
View File

@ -1,14 +1,18 @@
using BLL;
using Apache.NMS.ActiveMQ.Commands;
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using System.Web;
using System.Web.Services;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Windows.Forms;
@ -18,6 +22,30 @@ namespace FineUIPro.Web
{
public partial class WorkBench : PageBase
{
#region 定义变量
/// <summary>
/// 当前登录人Id
/// </summary>
public string UserId
{
get
{
return (string)ViewState["UserId"];
}
set
{
ViewState["UserId"] = value;
}
}
#endregion
#region Init
/// <summary>
/// Init
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Init(object sender, EventArgs e)
{
string themeStr = Request.QueryString["theme"];
@ -56,19 +84,35 @@ namespace FineUIPro.Web
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
var user = BLL.UserService.GetUserByUserId(this.CurrUser.UserId);
if (user != null)
{
this.UserId = this.CurrUser.UserId;
this.lName.Text = user.UserName;
this.lblName.Text = "欢迎回来，" + user.UserName;
this.lAccount.Text = user.Account;
this.lUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(user.UnitId);
this.lEmail.Text = user.Email;
if (!string.IsNullOrEmpty(user.IdentityCard))
{
var person = BLL.PersonService.GetPersonImgByIdentityCard(user.IdentityCard);
if (person != null)
{
this.imgPic.Src = ("~/" + person.PhotoUrl);
}
}
//this.lPostName.Text = user.WorkPostId;
}
//公司级看板权限
@ -80,8 +124,6 @@ namespace FineUIPro.Web
{
divgsj.Visible = false;
}
BindGridToDo("1");//待办预警
BindGrid("1",""); //我的项目
if (Request.Cookies["SelectLan"] != null)
{
@ -93,127 +135,68 @@ namespace FineUIPro.Web
}
}
}
#region 待办预警
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGridToDo(string sType)
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", this.CurrUser.UserId));
listStr.Add(new SqlParameter("@sType", sType));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = BLL.SQLHelper.GetDataTableRunProc("Sp_WorkBench_GetToDoItems", parameter);
Grid2.RecordCount = tb.Rows.Count;
Grid2.DataSource = this.GetPagedDataTable(Grid2, tb);
this.Grid2.DataBind();
}
#endregion
#region Grid
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
#region 待办预警
[WebMethod]
public static string getGztm(string userId, string sType)
{
BindGridToDo(hdToDoState.Text.Trim());
}
/// <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(hdState.Text.Trim());
//}
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGridToDo(hdToDoState.Text.Trim());
}
#endregion
#region 双击行事件
/// <summary>
/// 双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
if (!string.IsNullOrEmpty(Grid2.SelectedRowID))
string returnDbHtml = "";
var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
foreach (var item in getDataList)
{
int i = Grid2.SelectedRowIndex;
string url = Grid2.Rows[i].Values[4].ToString();
if (!string.IsNullOrEmpty(url))
{
//url = "CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&&InspectionMachineId=3df44927-074a-4381-9cfe-a050ff4c2185";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url), "待办"));
}
returnDbHtml += "<div class=\"z-item\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><p class=\"z-val\"><span>" + item.ProjectCode + " " + "</span><span>" + item.MenuName + " " + item.Content + "</span></p><p class=\"z-data\">" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</p></div>";
}
}
#endregion
#region 切换待办预警
protected void btnAll_Click(object sender, EventArgs e)
{
hdToDoState.Text = "1";
BindGridToDo("1");//全部
return returnDbHtml;
}
protected void btnTo_Click(object sender, EventArgs e)
/// <summary>
/// 打开待办
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnshowWindows(object sender, EventArgs e)
{
hdToDoState.Text = "2";
BindGridToDo("2");//待办
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("{0}", hiddenUrl.Value, "办理 - ")));
}
protected void btnDo_Click(object sender, EventArgs e)
{
hdToDoState.Text = "3";
BindGridToDo("3");//预警
}
#endregion
#endregion
#region 我的项目
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid(string proState,string urlType="")
[WebMethod]
public static string getProject(string proState, string userId)
{
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sedinId)
string returnDbHtml = "";
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState from Base_Project"
+ @" WHERE 1=1";
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
(case when AttachFile.AttachUrl is not null
then '../../'+RIGHT(AttachFile.AttachUrl, CHARINDEX(',', REVERSE(AttachFile.AttachUrl)) - 1)
else '../../res/images/16.png' end )
as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (proState == "2")
if (proState != "1")
{
strSql += " AND (ProjectState = '2' )";
}
else if (proState == "3")
{
strSql += " AND (ProjectState = '3' )";
strSql += " AND (ProjectState = '" + proState + "' )";
}
else
{
strSql += " AND (ProjectState = '1' OR ProjectState IS NULL)";
}
strSql += " order by ProjectCode";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"z-item\"><p class=\"z-val\"><span><img style=\"height: .350rem; width: .350rem; \" src='" + tb.Rows[i][4].ToString() + "'/></span><span>" + tb.Rows[i][2].ToString() + "</span></p><p class=\"z-data\"><div id=\"mybtn\" style=\"cursor:pointer\" onclick=\"javascrtpt:window.location.href='indexProject.aspx?projectId=" + tb.Rows[i][0].ToString() + "'\">进入项目</div></p></div>";
}
}
else
{
var getUser = UserService.GetUserByUserId(this.CurrUser.UserId);
string urlType = "";
var getUser = UserService.GetUserByUserId(userId);
if (getUser != null)
{
/// 获取角色类型
@ -224,224 +207,125 @@ namespace FineUIPro.Web
//五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的
if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState from Base_Project"
+ @" WHERE 1=1";
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
(case when AttachFile.AttachUrl is not null
then '../../'+RIGHT(AttachFile.AttachUrl, CHARINDEX(',', REVERSE(AttachFile.AttachUrl)) - 1)
else '../../res/images/16.png' end )
as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (proState == "2")
if (proState != "1")
{
strSql += " AND (ProjectState = '2' )";
}
else if (proState == "3")
{
strSql += " AND (ProjectState = '3' )";
strSql += " AND (ProjectState = '" + proState + "' )";
}
else
{
strSql += " AND (ProjectState = '1' OR ProjectState IS NULL)";
}
strSql += " order by ProjectCode";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"z-item\"><p class=\"z-val\"><span><img style=\"height: .350rem; width: .350rem; \" src='" + tb.Rows[i][4].ToString() + "'/></span><span>" + tb.Rows[i][2].ToString() + "</span></p><p class=\"z-data\"><div id=\"mybtn\" style=\"cursor:pointer\" onclick=\"javascrtpt:window.location.href='indexProject.aspx?projectId=" + tb.Rows[i][0].ToString() + "'\">进入项目</div></p></div>";
}
}
else
{
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
where ((pu.UserId=@userId and pu.IsPost='true') or p.UnitId=@unitId)
and p.ProjectState = @state"
+ @" WHERE 1=1";
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName,p.ProjectState
(case when AttachFile.AttachUrl is not null
then '../../'+RIGHT(AttachFile.AttachUrl, CHARINDEX(',', REVERSE(AttachFile.AttachUrl)) - 1)
else '../../res/images/16.png' end )as AttachUrl
from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
left join AttachFile on AttachFile.ToKeyId=p.ProjectId
where ((pu.UserId=@userId and pu.IsPost='true') or p.UnitId=@unitId)";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", this.CurrUser.UserId));
listStr.Add(new SqlParameter("@userId", userId));
listStr.Add(new SqlParameter("@unitId", getUser.UnitId));
listStr.Add(new SqlParameter("@state", proState));
if (proState != "1")
{
strSql += " AND (ProjectState = '" + proState + "' )";
}
else
{
strSql += " AND (ProjectState = '1' OR ProjectState IS NULL)";
}
strSql += " order by ProjectCode";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"z-item\"><p class=\"z-val\"><span><img style=\"height: .350rem; width: .350rem; \" src='" + tb.Rows[i][4].ToString() + "'/></span><span>" + tb.Rows[i][2].ToString() + "</span></p><p class=\"z-data\"><div id=\"mybtn\" style=\"cursor:pointer\" onclick=\"javascrtpt:window.location.href='indexProject.aspx?projectId=" + tb.Rows[i][0].ToString() + "'\">进入项目</div></p></div>";
}
}
}
else
{
if (getRoleP != null)
{
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState from Base_Project"
+ @" WHERE 1=1";
string strSql = @"select ProjectId,ProjectCode,(ProjectCode+' '+ProjectName) as ProjectName,ProjectState,
(case when AttachFile.AttachUrl is not null
then '../../'+RIGHT(AttachFile.AttachUrl, CHARINDEX(',', REVERSE(AttachFile.AttachUrl)) - 1)
else '../../res/images/16.png' end )
as AttachUrl
from Base_Project
left join AttachFile on AttachFile.ToKeyId=Base_Project.ProjectId"
+ @" WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (proState == "2")
if (proState != "1")
{
strSql += " AND (ProjectState = '2' )";
}
else if (proState == "3")
{
strSql += " AND (ProjectState = '3' )";
strSql += " AND (ProjectState = '" + proState + "' )";
}
else
{
strSql += " AND (ProjectState = '1' OR ProjectState IS NULL)";
}
strSql += " order by ProjectCode";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"z-item\"><p class=\"z-val\"><span><img style=\"height: .350rem; width: .350rem; \" src='" + tb.Rows[i][4].ToString() + "'/></span><span>" + tb.Rows[i][2].ToString() + "</span></p><p class=\"z-data\"><div id=\"mybtn\" style=\"cursor:pointer\" onclick=\"javascrtpt:window.location.href='indexProject.aspx?projectId=" + tb.Rows[i][0].ToString() + "'\">进入项目</div></p></div>";
}
}
else
{
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
where pu.UserId=@userId and pu.IsPost='true'
and p.ProjectState = @state";
string strSql = @"select distinct p.ProjectId,p.ProjectCode,(p.ProjectCode+' '+p.ProjectName) as ProjectName,p.ProjectState,
(case when AttachFile.AttachUrl is not null
then '../../'+RIGHT(AttachFile.AttachUrl, CHARINDEX(',', REVERSE(AttachFile.AttachUrl)) - 1)
else '../../res/images/16.png' end ) as AttachUrl
from Base_Project p
left join Project_ProjectUser as pu on pu.ProjectId = p.ProjectId
left join AttachFile on AttachFile.ToKeyId=p.ProjectId
where pu.UserId=@userId and pu.IsPost='true' ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", this.CurrUser.UserId));
listStr.Add(new SqlParameter("@state", proState));
listStr.Add(new SqlParameter("@userId", userId));
if (proState != "1")
{
strSql += " AND (p.ProjectState = '" + proState + "' )";
}
else
{
strSql += " AND (p.ProjectState = '1' OR p.ProjectState IS NULL)";
}
strSql += " order by ProjectCode";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
Grid1.DataBind();
for (int i = 0; i < tb.Rows.Count; i++)
{
returnDbHtml += "<div class=\"z-item\"><p class=\"z-val\"><span><img style=\"height: .350rem; width: .350rem; \" src='" + tb.Rows[i][4].ToString() + "'/></span><span>" + tb.Rows[i][2].ToString() + "</span></p><p class=\"z-data\"><div id=\"mybtn\" style=\"cursor:pointer\" onclick=\"javascrtpt:window.location.href='indexProject.aspx?projectId=" + tb.Rows[i][0].ToString() + "'\">进入项目</div></p></div>";
}
}
}
}
}
return returnDbHtml;
}
#endregion
#region 显示项目图片
/// <summary>
/// 显示项目图片
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
protected string ConvertProjectImage(object projectId)
{
string url = string.Empty;
if (projectId != null)
{
var att = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == projectId);
if (att != null)
{
url = BLL.UploadAttachmentService.ShowProjectImage("../../", att.AttachUrl);
}
else
{
url = BLL.UploadAttachmentService.ShowProjectImage("../../", "res/images/16.png");
}
}
return url;
}
#endregion
#region Grid
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid(hdState.Text.Trim(),"");
}
/// <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(hdState.Text.Trim());
//}
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid(hdState.Text.Trim(),"");
}
#endregion
#region 双击行事件
/// <summary>
/// 双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top");
}
else
{
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
#endregion
#region 右键进入项目
/// <summary>
/// 右键进入项目
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnEnter_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top");
}
else
{
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
#endregion
#region 切换项目状态
protected void zjProject_Click(object sender, EventArgs e)
{
hdState.Text = "1";
BindGrid("1","");//在建项目
}
protected void ztProject_Click(object sender, EventArgs e)
{
hdState.Text = "2";
BindGrid("2","");//暂停项目
}
protected void wgProject_Click(object sender, EventArgs e)
{
hdState.Text = "3";
BindGrid("3","");//完工项目
}
#endregion
#region Grid行点击事件
/// <summary>
/// Grid行点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "LoginProject")
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top");
}
}
#endregion
#endregion
#region 跳转公司级看板
/// <summary>
/// 跳转公司级看板
@ -457,6 +341,7 @@ namespace FineUIPro.Web
}
#endregion
#region 任务中心
/// <summary>
/// 任务中心
/// </summary>
@ -466,7 +351,9 @@ namespace FineUIPro.Web
{
ShowNotify("开发中");
}
#endregion
#region 系统管理
/// <summary>
/// 系统管理
/// </summary>
@ -476,6 +363,7 @@ namespace FineUIPro.Web
{
ShowNotify("开发中");
}
#endregion
#region 中英文切换
/// <summary>
@ -496,6 +384,18 @@ namespace FineUIPro.Web
Response.Cookies.Add(lanCookie);
Response.Redirect(Request.UrlReferrer.ToString());//刷新当前页面
}
#endregion
#endregion
#region 个人信息
/// <summary>
/// 个人信息
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPersonal_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Personal/PersonalInfo.aspx")));
}
#endregion
}
}

156
SGGL/FineUIPro.Web/WorkBench.aspx.designer.cs generated
View File

@ -104,6 +104,24 @@ namespace FineUIPro.Web
/// </remarks>
protected global::System.Web.UI.WebControls.Literal lName;
/// <summary>
/// btnPersonal 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPersonal;
/// <summary>
/// imgPic 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlImage imgPic;
/// <summary>
/// lblName 控件。
/// </summary>
@ -150,139 +168,22 @@ namespace FineUIPro.Web
protected global::System.Web.UI.WebControls.Literal lPostName;
/// <summary>
/// btnAll 控件。
/// hiddenUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAll;
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hiddenUrl;
/// <summary>
/// btnTo 控件。
/// btnShowWindows 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTo;
/// <summary>
/// btnDo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDo;
/// <summary>
/// hdToDoState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdToDoState;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
/// <summary>
/// zjProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button zjProject;
/// <summary>
/// ztProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button ztProject;
/// <summary>
/// wgProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button wgProject;
/// <summary>
/// hdState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdState;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// labNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// lbImageUrl3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl3;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
protected global::FineUIPro.Button btnShowWindows;
/// <summary>
/// Window1 控件。
@ -294,21 +195,12 @@ namespace FineUIPro.Web
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnEnter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnEnter;
protected global::FineUIPro.Window Window2;
}
}

4
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -1582,8 +1582,8 @@ namespace FineUIPro.Web.common
div_grlc.InnerHtml = getDataList.Count().ToString();
foreach (var item in getDataList)
{
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><li><span>" +
item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</li></span></div>";
}
}
else

43
SGGL/FineUIPro.Web/index.aspx
View File

@ -43,8 +43,8 @@
background-color: transparent !important;
}
.t-btn1 .f-field{
margin:0;
.t-btn1 .f-field {
margin: 0;
}
.bgbtn {
@ -106,9 +106,11 @@
.f-menu-item-text, .f-tree-cell-text, .f-widget-content a, .f-qtip-content {
color: #fff;
}
.f-field-body-cell-inner .f-corner-all {
background-color: rgb(0, 0, 0, 0);
}
background-color: rgb(0, 0, 0, 0);
}
.f-corner-all {
background-color: rgb(23, 68, 122);
font-size: 12px;
@ -350,12 +352,12 @@
</div>
</div>
<div class="nav-center" style="position: relative;">
<h1>中国五环工程有限公司智慧施工管理信息系统（公司级）<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
<h1>中国五环工程有限公司智慧施工管理信息系统<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
</f:Button>
</h1>
<div class="projcet-select" style="display:none;">
<div class="projcet-select">
<f:DropDownBox runat="server" ID="drpProject" Label="" EmptyText="如要筛选项目请点击此处选择" MatchFieldWidth="false" LabelAlign="Left"
AutoPostBack="true" OnTextChanged="drpProject_SelectedIndexChanged" Width="500px"
EnableMultiSelect="true" Hidden="true">
@ -406,8 +408,13 @@
<div class="btns t-btns t-btn-r">
<div class="t-btn1" onclick="WorkBenchFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="Home" OnClick="btnWorkBench_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnWorkBench" OnClientClick="parent.removeActiveTab();">
</f:Button>
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnWorkBench" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<div class=" t-btn1" onclick="CallFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" Hidden="false" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="<%$ Resources:Lan,call %>"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<%--<div class="t-btn1 iconfont icon-yonghu" onclick="ProjectListsFunction()" style="cursor: pointer;" >
<span>
@ -419,13 +426,13 @@
</div>--%>
<div class=" t-btn1" onclick="PersonalFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
</f:Button>
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<div class="t-btn1" onclick="btnSysSetFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnSysSet_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
</f:Button>
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<%--<div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
<span><asp:Literal runat="server" Text="<%$ Resources:Lan,quit %>" />
@ -438,8 +445,8 @@
</span>
</div>--%>
<div class="t-btn1 ab" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="ArrowsAlt" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="ArrowsAlt" >
<f:Button runat="server" CssClass="bgbtntop" IconFont="ArrowsAlt" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="ArrowsAlt">
</f:Button>
</div>
<div class="t-btn1">
@ -602,7 +609,7 @@
runat="server" IsModal="true" Width="1200px" Height="620px" EnableClose="true"
EnableMaximize="true" EnableResize="false">
</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="Top" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="600px">
</f:Window>
@ -967,6 +974,12 @@
function WorkBenchFunction() {
$('[id$="_btnWorkBench"]').click();
}
//呼叫
function CallFunction() {
// 弹出一个新窗口，加载指定的URL
//window.open('https://www.baidu.com', '_blank');
$('[id$="_btnCall"]').click();
}
//项目级
//function ProjectListsFunction() {
// $('[id$="_btnProjectLists"]').click();

38
SGGL/FineUIPro.Web/index.aspx.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Configuration;
using System.Linq;
using System.Security.Policy;
using System.Web;
using System.Web.UI.WebControls;
using System.Xml;
@ -307,7 +308,7 @@ namespace FineUIPro.Web
if (!IsPostBack)
{
//选择项目为空
CurrUser.CompanyProjectId = "";
//CurrUser.CompanyProjectId = "";
this.MenuSwitchMethod(Request.Params["menuType"]);
this.InitMenuStyleButton();
@ -454,16 +455,17 @@ namespace FineUIPro.Web
protected void btnHome_Click(object sender, EventArgs e)
{
if (this.leftPanel.Hidden)
{
string url = "~/indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.CurrUser.LastProjectId);
PageContext.Redirect(url, "_top");
}
else
{
this.MenuSwitchMethod(string.Empty);
}
//if (this.leftPanel.Hidden)
//{
// string url = "~/indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
// UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.CurrUser.LastProjectId);
// PageContext.Redirect(url, "_top");
//}
//else
//{
//this.MenuSwitchMethod(string.Empty);
//}
PageContext.Redirect("~/index.aspx", "_top");
}
protected void btnPerson_Click(object sender, EventArgs e)
@ -478,8 +480,8 @@ namespace FineUIPro.Web
protected void btnProject_Click(object sender, EventArgs e)
{
//this.MenuSwitchMethod(Const.Menu_Project);
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/ProjectItems.aspx", "查看 - ")));
this.MenuSwitchMethod(Const.Menu_Project);
//PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/ProjectItems.aspx", "查看 - ")));
}
protected void btnServer_Click(object sender, EventArgs e)
@ -640,7 +642,15 @@ namespace FineUIPro.Web
{
PageContext.Redirect("~/WorkBench.aspx", "_top");
}
/// <summary>
/// 呼叫
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPhoneClick(object sender, EventArgs e)
{
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ProjectData/ProjectUserContact.aspx")));
}
/// <summary>
/// 进入项目级
/// </summary>

9
SGGL/FineUIPro.Web/index.aspx.designer.cs generated
View File

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

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

@ -111,9 +111,10 @@
color: #fff;
}
.f-field-body-cell-inner .f-corner-all {
background-color: rgb(0, 0, 0, 0);
}
.f-field-body-cell-inner .f-corner-all {
background-color: rgb(0, 0, 0, 0);
}
.f-corner-all {
background-color: rgb(23, 68, 122);
font-size: 12px;
@ -226,10 +227,11 @@
}
.t-btn1 {
padding: 0 .15rem;
padding: 0 4px;
}
.t-btn .f-btn{
padding: 0;
.t-btn .f-btn {
padding: 0;
}
</style>
</head>
@ -244,18 +246,11 @@
<div class="header">
<div class="nav-left">
<div class="nav-btn t-btns p-t-btns" style="justify-content: flex-start;">
<div class="projectSelect" style="display: none;">
<div class="projectSelect">
<f:DropDownList runat="server" Width="150px" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
AutoPostBack="true" EnableEdit="true" CssClass="" Hidden="true">
</f:DropDownList>
</div>
<div class="t-btn" onclick="ProjectListsFunction()" style="cursor: pointer;" >
<span>
<f:Button runat="server" CssClass="bgbtntop" IconFont="Exchange" OnClick="btnProjectLists_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnProjectLists" OnClientClick="parent.removeActiveTab();">
</f:Button>
</span>
<f:Label ID="lblProjectName" runat="server"></f:Label>
</div>
<div class="t-btn t-btn-act" onclick="ProjectZJClick();" style="cursor: pointer;display:none;">在建</div>
<div class="t-btn" onclick="ProjectTGClick();" style="cursor: pointer;display:none;">停工</div>
@ -283,7 +278,7 @@
</div>
</div>
<div class="nav-center">
<h1>中国五环工程有限公司智慧施工管理信息系统（项目级）<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
<h1>项目智慧施工管理信息系统<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
EnableDefaultState="true" EnableDefaultCorner="false" ID="Button21">
</f:Button>
</h1>
@ -291,7 +286,7 @@
<div class="nav-right">
<div class="btns t-btns t-btn-r">
<div class=" t-btn1 " onclick="WorkBenchFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="Home" OnClick="btnWorkBench_Click" Hidden="false"
<f:Button runat="server" CssClass="bgbtntop" IconFont="Home" OnClick="btnWorkBench_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnWorkBench" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
@ -303,23 +298,26 @@
</span>
</div>--%>
<div class=" t-btn1" onclick="CallFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" Hidden="false" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="<%$ Resources:Lan,call %>"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
<f:Button runat="server" CssClass="bgbtntop" Hidden="false" IconFont="_Phone" OnClick="btnPhoneClick" ToolTip="<%$ Resources:Lan,call %>"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<div class="t-btn1" onclick="ToDo()" style="cursor: pointer">
<%--<f:Button ID="btnTodo" IconUrl="~/res/image/message.png" CssClass="bgbtntop" runat="server" OnClick="btnTodo_OnClick" />--%>
<f:Button runat="server" CssClass="bgbtntop" IconFont="BellO" OnClick="btnTodo_OnClick" ToolTip="待办" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnTodo" OnClientClick="parent.removeActiveTab();">
<div class="t-btn1" onclick="ProjectListsFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconUrl="~/res/assets/image/changeProject.png" OnClick="btnProjectLists_Click" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnProjectLists" OnClientClick="parent.removeActiveTab();">
</f:Button>
<%--<f:Button ID="btnTodo" IconUrl="~/res/image/message.png" CssClass="bgbtntop" runat="server" OnClick="btnTodo_OnClick" />--%>
<%-- <f:Button runat="server" CssClass="bgbtntop" IconFont="BellO" OnClick="btnTodo_OnClick" ToolTip="待办" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnTodo" OnClientClick="parent.removeActiveTab();">
</f:Button>--%>
<%--<span id="notification-badge" class="notification-badge" >2</span>--%>
<span id="notification-badge" class=" notification-badge" style="display: none;">0</span>
<%-- <span id="notification-badge" class=" notification-badge" style="display: none;">0</span>--%>
</div>
<div class="t-btn1 " onclick="PersonalFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
</f:Button>
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<div class="t-btn1 " onclick="btnSysSetFunction()" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnProjectSet_Click" ToolTip="项目设置" Hidden="false"
@ -342,8 +340,8 @@
</span>
</div>--%>
<div class="t-btn1 ab" style="cursor: pointer">
<f:Button runat="server" CssClass="bgbtntop" IconFont="ArrowsAlt" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="ArrowsAlt" >
<f:Button runat="server" CssClass="bgbtntop" IconFont="ArrowsAlt" Hidden="false"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="ArrowsAlt">
</f:Button>
</div>
<div class="c_lang">
@ -498,8 +496,7 @@
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>
@ -507,10 +504,6 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="700px">
</f:Window>
<f:Window ID="Window3" Title="切换项目" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="700px">
</f:Window>
<asp:XmlDataSource ID="XmlDataSource1" runat="server" EnableCaching="false"></asp:XmlDataSource>
<f:Button runat="server" ID="ProjectZJ" OnClick="ProjectZJ_Click" Hidden="true"></f:Button>

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

@ -299,9 +299,21 @@ namespace FineUIPro.Web
Response.Expires = 0; //设置过期时间
Response.Cache.SetNoStore(); //在服务器端不缓存该页面
Response.AppendHeader("Pragma", "no-cache"); //在客户端不缓存
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false,"1");
if (!string.IsNullOrEmpty(Request.Params["projectId"]))
{
var pro = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
if (pro != null)
{
if (pro.ProjectState != "1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, pro.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
}
this.drpProject.SelectedValue = Request.Params["projectId"];
}
else if (!string.IsNullOrEmpty(Request.Params["projectName"]))
@ -309,11 +321,31 @@ namespace FineUIPro.Web
var getproject = ProjectService.GetProjectByProjectName(Request.Params["projectName"]);
if (getproject != null)
{
if (getproject.ProjectState!="1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, getproject.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
this.drpProject.SelectedValue = getproject.ProjectId;
}
}
else if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
var pro = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (pro != null)
{
if (pro.ProjectState != "1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, pro.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
}
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
}
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
@ -327,6 +359,7 @@ namespace FineUIPro.Web
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == this.drpProject.SelectedValue);
if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
{
this.lblProjectName.Text = project.ProjectName;
this.hfProjectCode.Text = project.ProjectCode;
}
if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
@ -636,7 +669,6 @@ namespace FineUIPro.Web
/// <param name="type"></param>
protected void MenuSwitchMethod(string type)
{
// this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
this.XmlDataSource1.DataFile = "common/Menu_Personal.xml";
this.leftPanel.Hidden = true;
var projectUser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UserId);
@ -661,19 +693,6 @@ namespace FineUIPro.Web
}
}
}
//if (roleTypes.Contains(Const.Role_III))
//{
// this.Tab1.IFrameUrl = "~/common/mainIII.aspx?roleCNs=" + roleCNs;
//}
//else if (roleTypes.Contains(Const.Role_IV))
//{
// this.Tab1.IFrameUrl = "~/common/mainIV.aspx?roleCNs=" + roleCNs + "&unitWorkIds=" + projectUser.WorkAreaId;
//}
//else
//{
// this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
//}
this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
}
else
@ -749,17 +768,18 @@ namespace FineUIPro.Web
{
//修改本部用户都能进
//this.CurrUser.UnitId == Const.drpProject &&
if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
&& ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
{
UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
PageContext.Redirect("~/index.aspx", "_top");
}
else
{
this.MenuSwitchMethod(string.Empty);
}
//if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
// && ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
//{
// UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
// this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
// PageContext.Redirect("~/index.aspx", "_top");
//}
//else
//{
//this.MenuSwitchMethod(string.Empty);
//}
PageContext.Redirect("~/indexProject.aspx", "_top");
}
protected void btnCQMS_Click(object sender, EventArgs e)
{
@ -948,7 +968,7 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void btnProjectLists_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("~/SelectProject.aspx", "查看 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/SelectProject.aspx", "查看 - ")));
}

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

@ -69,13 +69,13 @@ namespace FineUIPro.Web
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// btnProjectLists 控件。
/// lblProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnProjectLists;
protected global::FineUIPro.Label lblProjectName;
/// <summary>
/// Button21 控件。
@ -105,13 +105,13 @@ namespace FineUIPro.Web
protected global::FineUIPro.Button btnCall;
/// <summary>
/// btnTodo 控件。
/// btnProjectLists 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTodo;
protected global::FineUIPro.Button btnProjectLists;
/// <summary>
/// btnPersonal 控件。
@ -374,15 +374,6 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// XmlDataSource1 控件。
/// </summary>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

2
SGGL/FineUIPro.Web/res/css/company.css
View File

@ -483,7 +483,7 @@ body {
font-family: "iconfont" !important;
font-size: .25rem;
font-style: normal;
color: #BCDEFF;
color: #FFFFFF;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

162
SGGL/FineUIPro.Web/res/largescreen/css/userPage.css
View File

@ -30,7 +30,7 @@
}
.z-head>.z-logo>.z-tit>p:first-child {
font-size: .375rem;
font-size: .275rem;
color: #FFFFFF;
line-height: .375rem;
letter-spacing: .025rem;
@ -56,7 +56,7 @@
.navbars>.nav {
padding: .125rem .175rem;
color: #ffffff;
font-size: .2rem;
font-size: .3rem;
line-height: .2rem;
font-weight: bold;
margin-left: .6875rem;
@ -79,13 +79,13 @@
.user-box>.langue {
color: #ffffff;
/* background-image: url(../images/down.png);*/
/*background-image: url(../images/down.png);*/
background-position: right center;
background-repeat: no-repeat;
background-size: .3rem .2rem;
font-size: .175rem;
padding: 4px 0;
padding-right: .125rem;
padding-right: .325rem;
border-right: 2px solid #3686DC;
position: relative;
}
@ -131,7 +131,7 @@
}
.z-info {
width: 4.95rem;
width: 4.2rem;
height: 100%;
background-color: #ffffff;
box-shadow: 0px 0px 16px 1px rgba(0, 0, 0, 0.08);
@ -165,10 +165,11 @@
text-align: center;
color: #333333;
font-weight: bold;
font-size: .25rem;
}
.z-infoa{
width: 100%;
padding-left: .9375rem;
padding-left: .3375rem;
}
.z-infoa>.z-row{
display: flex;
@ -176,6 +177,7 @@
justify-content: flex-start;
align-items: center;
padding: .125rem 0;
font-size: .200rem;
}
.z-infoa>.z-row>span{
margin: 0 .125rem;
@ -189,7 +191,7 @@
}
.z-a{
height: 100%;
width: calc(100% - 4.95rem);
width: calc(100% - 2.55rem);
padding-left: .375rem;
display: flex;
flex-direction: column;
@ -203,7 +205,7 @@
justify-content: space-between;
align-items: flex-start;
}
.z-b>.z-box1{
.z-b>.z-boxone{
height: 100%;
width: calc((100% - .25rem) / 2);
background: #FFFFFF;
@ -212,14 +214,14 @@
padding: .375rem;
}
.z-box>.z-box1-tit,.z-b>.z-box1>.z-box1-tit{
.z-box>.z-boxone-tit,.z-b>.z-boxone>.z-boxone-tit{
height: .325rem;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.z-box>.z-box1-tit>.z-box1-text,.z-b>.z-box1>.z-box1-tit>.z-box1-text{
.z-box>.z-boxone-tit>.z-boxone-text,.z-b>.z-boxone>.z-boxone-tit>.z-boxone-text{
color: #333333;
font-size: .225rem;
line-height: .225rem;
@ -262,31 +264,63 @@
border: 1px solid #0368D3 !important;
color: #0368D3;
}
.z-main{
.z-main {
width: 100%;
height: calc(100% - .325rem);
padding-top: .25rem;
position: relative;
overflow-y:auto;
}
.z-main>ul>li{
display: flex;
flex-direction: row;
padding: .125rem 0;
font-size: .175rem;
line-height: .175rem;
}
.z-main>ul>li>p:last-child{
width: 1.25rem;
color: #999999;
}
.z-main>ul>li>p:first-child{
width: calc(100% - 1.25rem);
padding-right: .25rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
}
.z-main > .z-a > .z-b {
display: flex;
flex-direction: row;
align-items: center;
font-size: .175rem;
line-height: .425rem;
}
.z-main > .z-a > .z-b > p:last-child {
width: 1.25rem;
color: #999999;
}
.z-main > .z-a > .z-b > p:first-child {
width: calc(100% - 1.25rem);
padding-right: .25rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
}
.z-main > .z-a > .z-b > .row {
padding: .025rem 0;
width: calc(100% - 1.25rem);
padding-right: .25rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.z-main > .z-a > .z-b > .row > p {
width: calc(100% - .55rem);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
}
.z-main > .z-a > .z-b > .row > .img {
height: .425rem;
width: .425rem;
border: 1px solid #f5f5f5;
margin-right: .125rem;
overflow: hidden;
}
.z-main > .z-a > .z-b > .row > .img > img {
width: 100%;
height: 100%;
}
.page{
display: flex;
flex-direction: row;
@ -315,6 +349,7 @@
width: .25rem;
line-height: .25rem;
margin: 0 .05rem;
font-size: .175rem;
}
.page-num-a{
color: #0368D3;
@ -339,15 +374,58 @@
justify-content: flex-start;
align-items: center;
}
.workBench-icon {
width: 1.425rem;
height: .475rem;
background-image: url(../images/14.png);
background-position: center;
background-repeat: no-repeat;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 0 .1rem;
}
.z-boxtwo{
height: 100%;
width: 100%;
}
.z-boxtwo > .z-item {
display: flex;
flex-direction: row;
align-items: center;
vertical-align:middle;
height: .550rem;
font-size: .200rem;
}
.z-boxtwo > .z-item > .z-val {
width: calc(100% - 1.25rem);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
}
.z-boxtwo > .z-item > .z-val > span {
margin-right: .05rem;
}
.z-boxtwo > .z-item > .z-date {
width: 1.25rem;
}
.z-main > .row > p {
width: calc(100% - .55rem);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
color: #333333;
font-size:.175rem;
}
/*.t-btn1 {
padding: 0 .125rem;
}
@font-face {
font-family: 'iconfont';*/
/* Project id 4582260 */
/*src: url('../../font/iconfont.woff2') format('woff2'), url('../../font/iconfont.woff') format('woff'), url('../../font/iconfont.ttf') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: .25rem;
font-style: normal;
color: #BCDEFF;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-tuichu:before {
content: "\e728";
}*/

BIN
SGGL/FineUIPro.Web/res/largescreen/images/LoginPic.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 248 KiB

9
SGGL/Model/APIItem/ToDoItem.cs
View File

@ -95,5 +95,14 @@ namespace Model
get;
set;
}
/// <summary>
/// 项目号
/// </summary>
public string ProjectCode
{
get;
set;
}
}
}

15
SGGL/Model/ModelProc.cs
View File

@ -61,7 +61,7 @@ namespace Model
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, states, pageIndex, pageSize);
return (ISingleResult<RectifyNoticesItem>)result.ReturnValue;
}
/// <summary>
/// »ñÈ¡ÏÖ³¡µ¥Î»¿¼ÇÚ
/// </summary>
@ -106,5 +106,18 @@ namespace Model
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, userId);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
/// <summary>
/// 获取当前用户工作台待办预警
/// </summary>
/// <param name="userId"></param>
/// <param name="sType"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_WorkBench_GetToDoItems]")]
public IEnumerable<ToDoItem> Sp_WorkBench_GetToDoItems([Parameter(DbType = "nvarchar(200)")] string userId, [Parameter(DbType = "nvarchar(10)")] string sType)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), userId, sType);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
}
}

2
SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />