提交代码
This commit is contained in:
@@ -250,13 +250,20 @@
|
||||
<div class="bw-b-bottom-up">
|
||||
<div class="bw-item-content pd0">
|
||||
<div class="base-wrap flex flexV">
|
||||
<div class="base-tit">当前现场总人数</div>
|
||||
<div class="base-txt-wrap flex flex1">
|
||||
<div class="num-1 specialNum" runat="server" id="divperson">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person00">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person01">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person02">0</div>
|
||||
</div>
|
||||
<div class="base-tit">当日现场人数</div>
|
||||
<div class="base-txt-wrap flex flex1">
|
||||
<div class="num-1 specialNum" runat="server" id="divperson">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person00">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person01">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person02">0</div>
|
||||
</div>
|
||||
<div class="base-tit">当月现场人数</div>
|
||||
<div class="base-txt-wrap flex flex1">
|
||||
<div class="num-1 specialNum" runat="server" id="divperson1">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person001">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person011">0</div>
|
||||
<div class="num-1 specialNum" runat="server" id="person021">0</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -315,9 +322,9 @@
|
||||
<div class="bw-b-bottom-up">
|
||||
<div class="tab-wrap">
|
||||
<div class="tab" data-value="4">
|
||||
<div class="t-item active">施工分包商</div>
|
||||
<%-- <div class="t-item">施工分包商</div> --%>
|
||||
<div class="spline"></div>
|
||||
<div class="t-item">问题类别</div>
|
||||
<div class="t-item active ">问题类别</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content">
|
||||
@@ -686,20 +693,20 @@ var basePath = '<%= ResolveUrl("~/") %>';
|
||||
// 使用刚指定的配置项和数据显示图表。
|
||||
myChart.setOption(option)
|
||||
}
|
||||
var four1 =<%=Four1 %>;
|
||||
var xArr = four1.categories
|
||||
var four2 =<%=Four2 %>;
|
||||
var xArr = four2.categories
|
||||
var series = [{
|
||||
name: '待整改',
|
||||
type: 'bar',
|
||||
barWidth: 20,
|
||||
barGap:0.05,
|
||||
data: four1.series[0].data,
|
||||
data: four2.series[0].data,
|
||||
itemStyle: { normal: { color: '#88cc00' } }
|
||||
}, {
|
||||
name: '全部',
|
||||
type: 'bar',
|
||||
barWidth: 20,
|
||||
data: four1.series[0].data2,
|
||||
data: four2.series[0].data2,
|
||||
itemStyle: { normal: { color: '#AE4B23' } }
|
||||
}];
|
||||
category_Four('four', xArr, series)
|
||||
|
||||
@@ -5,6 +5,8 @@ using System;
|
||||
using System.CodeDom;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
|
||||
namespace FineUIPro.Web
|
||||
{
|
||||
@@ -43,48 +45,151 @@ namespace FineUIPro.Web
|
||||
/// </summary>
|
||||
private void getSitePerson()
|
||||
{
|
||||
int AllCount = 0;
|
||||
//var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
|
||||
DateTime dateValue = DateTime.Now.AddDays(-1);
|
||||
List<Model.PageDataPersonInOutItem> getallin = new List<Model.PageDataPersonInOutItem>();
|
||||
var getInMaxs = from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
|
||||
select new Model.PageDataPersonInOutItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
PostType = y.PostType,
|
||||
WorkPostId = x.WorkPostId,
|
||||
};
|
||||
if (getInMaxs.Count() > 0)
|
||||
// int AllCount = 0;
|
||||
// //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
|
||||
// DateTime dateValue = DateTime.Now.AddDays(-1);
|
||||
// List<Model.PageDataPersonInOutItem> getallin = new List<Model.PageDataPersonInOutItem>();
|
||||
// var getInMaxs = from x in Funs.DB.SitePerson_Person
|
||||
// join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
// where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
|
||||
// select new Model.PageDataPersonInOutItem
|
||||
// {
|
||||
// PersonId = x.PersonId,
|
||||
// PostType = y.PostType,
|
||||
// WorkPostId = x.WorkPostId,
|
||||
// };
|
||||
// if (getInMaxs.Count() > 0)
|
||||
// {
|
||||
// getallin = getInMaxs.Distinct().ToList();
|
||||
// }
|
||||
// //AllCount = getallin.Count();
|
||||
// var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord
|
||||
// join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
|
||||
// where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
|
||||
// select x.IDCardNo).Distinct();
|
||||
//
|
||||
// //if (AllCount > 0)
|
||||
// //{
|
||||
// // ////总人数
|
||||
// // this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
|
||||
// // this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
|
||||
// // this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
|
||||
// // this.person02.InnerHtml = (AllCount % 10).ToString();
|
||||
// //}
|
||||
//
|
||||
//
|
||||
// AllCount = getEmployInOutRecords.Count();
|
||||
// if (AllCount > 0)
|
||||
// {
|
||||
// ////总人数
|
||||
// this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
|
||||
// this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
|
||||
// this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
|
||||
// this.person02.InnerHtml = (AllCount % 10).ToString();
|
||||
// }
|
||||
|
||||
string strSql = @"SELECT DISTINCT ProjectUser.ProjectUserId,ProjectUser.ProjectId,ProjectUser.UserId,ProjectUser.WorkAreaId,Users.UserCode,Users.UserName,ProjectUser.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUser.RoleId,ProjectUser.IsPost,(CASE WHEN ProjectUser.IsPost = 1 THEN '在岗' ELSE '离岗' END) AS IsPostName,WorkPost.WorkPostName,UnitCode"
|
||||
+ @" ,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +ProjectUser.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')"
|
||||
+ @" FROM Project_ProjectUser AS ProjectUser "
|
||||
+ @" LEFT JOIN Base_Project AS Project ON ProjectUser.ProjectId = Project.ProjectId "
|
||||
+ @" LEFT JOIN Sys_User AS Users ON ProjectUser.UserId = Users.UserId "
|
||||
+ @" LEFT JOIN Sys_Role AS Role ON ProjectUser.RoleId = Role.RoleId "
|
||||
+ @" LEFT JOIN Project_ProjectUnit AS ProjectUnit ON ProjectUser.UnitId = ProjectUnit.UnitId AND ProjectUser.ProjectId= ProjectUnit.ProjectId "
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUser.UnitId = Unit.UnitId "
|
||||
+ @" LEFT JOIN SitePerson_Person AS Person ON ProjectUser.ProjectId =Person.ProjectId AND Users.IdentityCard = Person.IdentityCard "
|
||||
+ @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId "
|
||||
+ @" LEFT JOIN Sys_Const AS sysConst ON sysConst.GroupId = '" + BLL.ConstValue.Group_ProjectUnitType + "' AND ProjectUnit.UnitType=sysConst.ConstValue "
|
||||
+ @" WHERE 1=1 ";
|
||||
|
||||
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
strSql += " AND ProjectUser.ProjectId = @ProjectId";
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
var projectPeople = tb.Rows.Count;
|
||||
|
||||
|
||||
//当前日
|
||||
// 获取当前日期的00点
|
||||
DateTime now = DateTime.Now;
|
||||
DateTime StartDate = DateTime.Now.Date;
|
||||
|
||||
DateTime EndDate = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
|
||||
//当前月
|
||||
// 获取当前年份和月份
|
||||
int year = DateTime.Now.Year;
|
||||
int month = DateTime.Now.Month;
|
||||
// 获取当前月份的开始00点
|
||||
DateTime startOfMonth = new DateTime(year, month, 1);
|
||||
DateTime startOfNextMonth = startOfMonth.AddMonths(1);
|
||||
// 如果你需要当前月份的最后一天的23:59:59
|
||||
DateTime endOfMonth = startOfNextMonth.AddSeconds(-1);
|
||||
|
||||
string strSql1 = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
|
||||
+ @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
|
||||
+ @" FROM Meeting_ClassMeeting AS ClassMeeting "
|
||||
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
|
||||
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
|
||||
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
|
||||
+ @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
|
||||
List<SqlParameter> listStr1 = new List<SqlParameter>();
|
||||
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
|
||||
{
|
||||
getallin = getInMaxs.Distinct().ToList();
|
||||
strSql1 += " AND ClassMeeting.ProjectId = @ProjectId";
|
||||
listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
}
|
||||
//AllCount = getallin.Count();
|
||||
var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord
|
||||
join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
|
||||
where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
|
||||
select x.IDCardNo).Distinct();
|
||||
|
||||
//if (AllCount > 0)
|
||||
//{
|
||||
// ////总人数
|
||||
// this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
|
||||
// this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
|
||||
// this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
|
||||
// this.person02.InnerHtml = (AllCount % 10).ToString();
|
||||
//}
|
||||
|
||||
|
||||
AllCount = getEmployInOutRecords.Count();
|
||||
if (AllCount > 0)
|
||||
strSql1 += " AND ClassMeeting.ClassMeetingDate BETWEEN @StartDate AND @EndDate";
|
||||
listStr1.Add(new SqlParameter("@StartDate", StartDate));
|
||||
listStr1.Add(new SqlParameter("@EndDate", EndDate));
|
||||
SqlParameter[] parameter1 = listStr1.ToArray();
|
||||
DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
|
||||
var dr = tb1.Rows.Count;
|
||||
|
||||
|
||||
string strSql2 = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
|
||||
+ @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
|
||||
+ @" FROM Meeting_ClassMeeting AS ClassMeeting "
|
||||
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
|
||||
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
|
||||
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
|
||||
+ @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
|
||||
List<SqlParameter> listStr2 = new List<SqlParameter>();
|
||||
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
|
||||
{
|
||||
strSql2 += " AND ClassMeeting.ProjectId = @ProjectId";
|
||||
listStr2.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
}
|
||||
strSql2 += " AND ClassMeeting.ClassMeetingDate BETWEEN @StartDate AND @EndDate";
|
||||
listStr2.Add(new SqlParameter("@StartDate", startOfMonth));
|
||||
listStr2.Add(new SqlParameter("@EndDate", endOfMonth));
|
||||
SqlParameter[] parameter2 = listStr2.ToArray();
|
||||
DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
|
||||
|
||||
var dy = tb2.Rows.Count;
|
||||
|
||||
var count1 = projectPeople + dr;
|
||||
var count2 = projectPeople + dy;
|
||||
if (count1 > 0)
|
||||
{
|
||||
////总人数
|
||||
this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
|
||||
this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
|
||||
this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
|
||||
this.person02.InnerHtml = (AllCount % 10).ToString();
|
||||
this.divperson.InnerHtml = ((count1 % 10000) / 1000).ToString();
|
||||
this.person00.InnerHtml = ((count1 % 1000) / 100).ToString();
|
||||
this.person01.InnerHtml = ((count1 % 100) / 10).ToString();
|
||||
this.person02.InnerHtml = (count1 % 10).ToString();
|
||||
}
|
||||
|
||||
if (count2 > 0)
|
||||
{
|
||||
////总人数
|
||||
this.divperson1.InnerHtml = ((count2 % 10000) / 1000).ToString();
|
||||
this.person001.InnerHtml = ((count2 % 1000) / 100).ToString();
|
||||
this.person011.InnerHtml = ((count2 % 100) / 10).ToString();
|
||||
this.person021.InnerHtml = (count2 % 10).ToString();
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
+48
-10
@@ -7,11 +7,13 @@
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web {
|
||||
|
||||
|
||||
public partial class mainMenu_HSSE {
|
||||
|
||||
namespace FineUIPro.Web
|
||||
{
|
||||
|
||||
|
||||
public partial class mainMenu_HSSE
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Head1 控件。
|
||||
/// </summary>
|
||||
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// divperson 控件。
|
||||
/// </summary>
|
||||
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// person00 控件。
|
||||
/// </summary>
|
||||
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person00;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// person01 控件。
|
||||
/// </summary>
|
||||
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person01;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// person02 控件。
|
||||
/// </summary>
|
||||
@@ -56,7 +58,43 @@ namespace FineUIPro.Web {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person02;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// divperson1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson1;
|
||||
|
||||
/// <summary>
|
||||
/// person001 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person001;
|
||||
|
||||
/// <summary>
|
||||
/// person011 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person011;
|
||||
|
||||
/// <summary>
|
||||
/// person021 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl person021;
|
||||
|
||||
/// <summary>
|
||||
/// xmb 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user