diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs
index 47b69cf7..675f67cd 100644
--- a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs
+++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs
@@ -14,11 +14,11 @@ namespace FineUIPro.Web.AttachFile
var url = Request.Params["fileUrl"];
var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src=";
- // var Baseurl = "https://view.xdocin.com/view?src=";
+ // var Baseurl = "https://view.xdocin.com/view?src=";
var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, "");
var newurl = "";
var FiletExtension = Path.GetExtension(url);
- if (FiletExtension == ".docx" || FiletExtension == ".doc"|| FiletExtension == ".xls" || FiletExtension == ".xlsx")
+ if (FiletExtension == ".docx" || FiletExtension == ".doc" || FiletExtension == ".xls" || FiletExtension == ".xlsx")
{
newurl = Baseurl + Fileurl;
}
@@ -26,11 +26,11 @@ namespace FineUIPro.Web.AttachFile
{
newurl = Fileurl;
}
- else
- {
- newurl = Fileurl;
+ else
+ {
+ newurl = Fileurl;
}
- if (AttachFileService.IsImage(FiletExtension))
+ if (AttachFileService.IsImage(FiletExtension) && 1 > 2)
{
this.TabStrip1.Hidden = true;
this.Image1.Hidden = false;
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
index ac5b51e0..1e38ce4c 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
@@ -46,7 +46,7 @@
-
+
@@ -54,13 +54,13 @@
-
-
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
index dbb3e75f..46319a18 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
@@ -90,12 +90,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+ if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+ if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return;
@@ -818,12 +818,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+ if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+ if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return;
@@ -886,7 +886,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
else
{
-
+
var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{//责任人的时候保存关键事项
@@ -1014,12 +1014,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+ if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return;
}
- if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+ if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return;
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
index 5d5cca19..98ec808f 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
@@ -205,7 +205,7 @@
@@ -746,7 +746,7 @@
var option = {
title: {
// left:'center',
- text: '关键事项超期平均时间',
+ text: '关键事项超期平均时间统计（单位：天）',
textStyle: {
color: '#1C1C1C',
fontSize: 16,
@@ -756,11 +756,12 @@
},
tooltip: {},
legend: {
+ data: ['关键事项超期平均时间'],
left: '3%',
show: true,
selectedMode: false,
textStyle: {//图例文字的样式
- color: '#1C1C1C',
+ //color: '#1C1C1C',
fontSize: 16,
fontWeight: 700
}
@@ -842,10 +843,11 @@
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
+
var four =<%=Four %>;
var xArr = four.categories;
var series = [{
- name: '关键事项超期平均时间统计（单位：天）',
+ name: '关键事项超期平均时间',
type: 'bar',
barWidth: 30,
barGap: 0,
@@ -858,6 +860,7 @@
label: { show: true, position: "middle" },
lineStyle: {
type: "dashed",
+ width: 2,
color: "#3c78d8"
}
},
@@ -867,10 +870,12 @@
label: { show: true, position: "middle" },
lineStyle: {
type: "dashed",
+ width: 2,
color: "#FF0000"
}
}
- ]
+ ],
+ symbol: ['none', 'none']//标记线箭头
},
label: { //柱体上显示数值
show: true,//开启显示
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
index 9b389796..d069391e 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
@@ -12,6 +12,7 @@ using NPOI.SS.Formula.Functions;
using NPOI.XSSF.Streaming.Values;
using System.Web.UI.HtmlControls;
using System.Text;
+using FineUIPro.Web.SysManage;
namespace FineUIPro.Web
{
@@ -140,19 +141,32 @@ namespace FineUIPro.Web
List listCategories = new List();
businessColumn.title = "关键事项统计";
businessColumn.xFontNum = 5;
- var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId);
+ //var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId);
var allItems = from x in Funs.DB.GJSX
where x.ProjectId == this.ProjectId
select x;
+ //按照未关闭数取前10
+ var groupedUser = (from x in Funs.DB.GJSX
+ where x.ProjectId == this.ProjectId && x.State != "0"
+ select x).GroupBy(p => p.User_Acceptance)
+ .Select(g => new
+ {
+ UserId = g.Key,
+ Count = g.Count()
+ })
+ .OrderByDescending(x => x.Count)
+ .Take(10)
+ .ToList();
+
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List listdata = new List();
List listdata2 = new List();
int closeNum = 0;
- foreach (var userid in userIds)
+ foreach (var userid in groupedUser)
{
- listCategories.Add(UserService.GetUserNameByUserId(userid));
- var typeItems = allItems.Where(x => x.User_Acceptance == userid);
+ listCategories.Add(UserService.GetUserNameByUserId(userid.UserId));
+ var typeItems = allItems.Where(x => x.User_Acceptance == userid.UserId);
closeNum = typeItems.Where(x => x.State == "0").Count();
listdata.Add(typeItems.Count() - closeNum);
listdata2.Add(closeNum);
@@ -481,7 +495,7 @@ namespace FineUIPro.Web
double averageTypeDiffDay = 0;
if (typelst.Any())
{
- averageTypeDiffDay = typelst.Average(p => p.DiffDay);
+ averageTypeDiffDay = Math.Round(typelst.Average(p => p.DiffDay), 1);
}
listdata.Add(averageTypeDiffDay);
}
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7e27d609..57be39e8 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
<_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi
- True|2025-03-13T02:58:17.1401575Z||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
+ True|2025-03-13T08:44:25.3220313Z||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
@@ -86,22 +86,22 @@
10/28/2024 14:02:50
- 03/13/2025 10:58:15
+ 03/13/2025 16:44:23
- 03/13/2025 10:58:15
+ 03/13/2025 16:44:23
12/06/2024 20:13:58
- 03/13/2025 10:57:54
+ 03/13/2025 16:44:14
12/26/2024 09:46:52
- 03/13/2025 10:57:54
+ 03/13/2025 16:44:14
12/18/2020 05:32:28
@@ -389,13 +389,13 @@
02/09/2013 00:42:28
- 03/13/2025 10:57:58
+ 03/13/2025 16:44:14
- 03/13/2025 10:57:58
+ 03/13/2025 16:44:14
- 03/13/2025 10:57:57
+ 03/13/2025 16:44:14
01/23/2014 21:57:34
@@ -479,7 +479,7 @@
10/28/2024 14:02:50
- 03/13/2025 10:57:59
+ 03/13/2025 16:44:15
10/28/2024 14:02:50
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 470da34b..556827c1 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,4 +1,4 @@
-
+
Debug|Any CPU