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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
毕文静 2024-09-18 16:13:35 +08:00
parent 43ecf5a2ea 4063e5b7cf
commit 5f6e21c6ff
10 changed files with 88 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql Normal file
View File

@ -0,0 +1,5 @@
CREATE NONCLUSTERED INDEX [t_d_facerecord_Projectid_Index]
ON [dbo].[t_d_facerecord] ([ProjectId])
INCLUDE ([ID],[EmployName],[DepartmentID],[DepartName],[AreaID],[AreaName],[EmployNO],[CardID],[RoleID],[DateTimeRecord],[RecordDes],[FaceIP],[InOrOut],[Des1],[Des2],[Des3],[Des4])
;

52
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -326,7 +326,7 @@
/// 获取userId参与项目下拉框 /// 获取userId参与项目下拉框
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state) public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="")
{ {
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId) if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{ {
@ -340,20 +340,42 @@
{ {
/// 获取角色类型 /// 获取角色类型
var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == false); var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == false);
if (getRoleP != null) //如果是项目级别，获取到他的类型后，并且还要单位是五环的
if (!string.IsNullOrEmpty(urlType))
{ {
return (from x in Funs.DB.Base_Project //五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的
where x.ProjectState == state if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC)
orderby x.ProjectCode descending {
select x).ToList(); return (from x in Funs.DB.Base_Project
where x.ProjectState == state
orderby x.ProjectCode descending
select x).ToList();
}
else
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where ( (y.UserId == userId && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state
orderby x.ProjectCode descending
select x).Distinct().ToList();
}
} }
else else {
{ if (getRoleP != null)
return (from x in Funs.DB.Base_Project {
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId return (from x in Funs.DB.Base_Project
where y.UserId == userId && y.IsPost == true && x.ProjectState == state where x.ProjectState == state
orderby x.ProjectCode descending orderby x.ProjectCode descending
select x).Distinct().ToList(); select x).ToList();
}
else
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where y.UserId == userId && y.IsPost == true && x.ProjectState == state
orderby x.ProjectCode descending
select x).Distinct().ToList();
}
} }
} }
else else
@ -459,11 +481,11 @@
/// <param name="dropName"></param> /// <param name="dropName"></param>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <param name="isShowPlease"></param> /// <param name="isShowPlease"></param>
public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease) public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="")
{ {
dropName.DataValueField = "ProjectId"; dropName.DataValueField = "ProjectId";
dropName.DataTextField = "ProjectName"; dropName.DataTextField = "ProjectName";
var projectlist = GetProjectByUserIdStateDropDownList(userId, state); var projectlist = GetProjectByUserIdStateDropDownList(userId, state, urlType);
dropName.DataSource = projectlist; dropName.DataSource = projectlist;
dropName.DataBind(); dropName.DataBind();
if (projectlist.Count() == 0) if (projectlist.Count() == 0)

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

@ -19256,7 +19256,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

4
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -788,8 +788,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
model.InspectionSummaryId = Guid.NewGuid().ToString(); model.InspectionSummaryId = Guid.NewGuid().ToString();
model.InspectionSummaryMbId = "24"; model.InspectionSummaryMbId = "24";
var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).FirstOrDefault(); var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).Select(x=>x.ID).FirstOrDefault();
if (Rykq !=null) if (Rykq !=0)
{ {
model.SummeryResult = "已对接"; model.SummeryResult = "已对接";
} }

4
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
View File

@ -116,7 +116,7 @@
<div class="bw-b-bottom-up"> <div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px"> <div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;"> <div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">投料试车进度</div> <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="tlscNum" runat="server">投料试车进度</div>
</div> </div>
</div> </div>
<div class="tab-wrap"> <div class="tab-wrap">
@ -143,7 +143,7 @@
<div class="bw-b-bottom-up"> <div class="bw-b-bottom-up">
<div class="tab-wrap" style="left: 20px"> <div class="tab-wrap" style="left: 20px">
<div class="tab" style="border: 0; box-shadow: none;"> <div class="tab" style="border: 0; box-shadow: none;">
<div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">试运行进度</div> <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="syxNum" runat="server">试运行进度</div>
</div> </div>
</div> </div>
<div class="tab-wrap"> <div class="tab-wrap">

2
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
View File

@ -290,6 +290,7 @@ namespace FineUIPro.Web
InstallationName = item.InstallationName InstallationName = item.InstallationName
}); });
} }
tlscNum.InnerHtml = "投料试车进度(" + result.Count.ToString() + ")";
feedingRunStr = JsonConvert.SerializeObject(result); feedingRunStr = JsonConvert.SerializeObject(result);
} }
} }
@ -312,6 +313,7 @@ namespace FineUIPro.Web
InstallationName = item.InstallationName InstallationName = item.InstallationName
}); });
} }
syxNum.InnerHtml = "试运行进度(" + result.Count.ToString() + ")";
productsStr = JsonConvert.SerializeObject(result); productsStr = JsonConvert.SerializeObject(result);
} }
} }

30
SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web { namespace FineUIPro.Web
{
public partial class mainMenu_TestRun {
public partial class mainMenu_TestRun
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。
/// </summary> /// </summary>
@ -20,5 +22,23 @@ namespace FineUIPro.Web {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1; protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// tlscNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl tlscNum;
/// <summary>
/// syxNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl syxNum;
} }
} }

15
SGGL/FineUIPro.Web/common/main_new.aspx
View File

@ -1919,23 +1919,23 @@
textStyle: { textStyle: {
rich: { rich: {
a: { a: {
fontSize: 14, fontSize: 12,
color: '#DADADA', color: '#DADADA',
}, },
b: { b: {
color: '#FFFFFF', color: '#FFFFFF',
fontSize: 14, fontSize: 12,
}, },
c: { c: {
padding: [0, 6], padding: [0, 6],
fontSize: 14, fontSize: 12,
color: '#FFFFFF', color: '#FFFFFF',
}, },
d: { d: {
fontSize: 14, fontSize: 12,
color: '#12CDA2', color: '#12CDA2',
} }
} },
} }
}, },
], ],
@ -2325,7 +2325,7 @@
}, },
axisLabel: { axisLabel: {
interval: 0, interval: 0,
rotate: -16, // 如果数据较多时旋转标签以避免重叠 rotate: -10, // 如果数据较多时旋转标签以避免重叠
margin: 8, // 设置标签与轴线之间的距离 margin: 8, // 设置标签与轴线之间的距离
// align: 'center' // align: 'center'
}, },
@ -2535,7 +2535,8 @@
map: "china", map: "china",
roam: false, // 可以缩放和平移 roam: false, // 可以缩放和平移
aspectScale: 0.75, // 比例 aspectScale: 0.75, // 比例
top: 120, top: 130,
left: 170,
zlevel: 10, zlevel: 10,
zoom: 1.4, zoom: 1.4,
regions: [ regions: [

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

@ -162,9 +162,9 @@
.bgbtn_head { .bgbtn_head {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
width: 40%; width: 96%;
height: 50%; height: 50%;
left: 30%; left: 2%;
top: 0; top: 0;
background: none !important; background: none !important;
border: none !important; border: none !important;

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

@ -294,7 +294,7 @@ namespace FineUIPro.Web
Response.Expires = 0; //设置过期时间 Response.Expires = 0; //设置过期时间
Response.Cache.SetNoStore(); //在服务器端不缓存该页面 Response.Cache.SetNoStore(); //在服务器端不缓存该页面
Response.AppendHeader("Pragma", "no-cache"); //在客户端不缓存 Response.AppendHeader("Pragma", "no-cache"); //在客户端不缓存
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false); ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false,"1");
if (!string.IsNullOrEmpty(Request.Params["projectId"])) if (!string.IsNullOrEmpty(Request.Params["projectId"]))
{ {
this.drpProject.SelectedValue = Request.Params["projectId"]; this.drpProject.SelectedValue = Request.Params["projectId"];
@ -730,8 +730,10 @@ namespace FineUIPro.Web
protected void btnHome_Click(object sender, EventArgs e) protected void btnHome_Click(object sender, EventArgs e)
{ {
//修改本部用户都能进
//this.CurrUser.UnitId == Const.drpProject &&
if (string.IsNullOrEmpty(this.CurrUser.LastProjectId) if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
&& ((this.CurrUser.UnitId == Const.UnitId_CWCEC && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)) && ((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); UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;