diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index 73fb9210..49e5a7f1 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -272,8 +272,8 @@ namespace BLL { try { - DateTime dateS = DateTime.Now.AddMonths(-12); - dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01"); + DateTime dateS = DateTime.Now.AddMonths(-3); + dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-3).Year + "-" + DateTime.Now.AddMonths(-3).Month + "-01"); var getNums = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId && x.InOutDate >= dateS orderby x.InOutDate diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx index 28ae3853..3024a419 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx @@ -380,30 +380,30 @@ name: '累计人工时', type: 'line', data: two.series[0].data, - label: { //柱体上显示数值 - show: true,//开启显示 - position: 'top',//在上方显示 - textStyle: {//数值样式 - fontSize: '20px', - color: '#fff' - }, - formatter: '{c}', - }, + //label: { //柱体上显示数值 + // show: true,//开启显示 + // position: 'top',//在上方显示 + // textStyle: {//数值样式 + // fontSize: '20px', + // color: '#fff' + // }, + // formatter: '{c}', + // }, itemStyle: { normal: { color: '#00c771' } } },{ name: '当月人工时', type: 'bar', barWidth: 40, data: two.series[1].data, - label: { //柱体上显示数值 - show: true,//开启显示 - position: 'inside',//内部 - textStyle: {//数值样式 - fontSize: '20px', - color: '#fff' - }, - formatter: '{c}', - }, + //label: { //柱体上显示数值 + // show: true,//开启显示 + // position: 'inside',//内部 + // textStyle: {//数值样式 + // fontSize: '20px', + // color: '#fff' + // }, + // formatter: '{c}', + // }, }] category_Two('two', xArr, data)