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:
李鹏飞 2025-03-14 10:38:42 +08:00
parent 2d3c508193 3a83e0f5c6
commit 535156e260
7 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs
View File

@ -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;
}
@ -30,7 +30,7 @@ namespace FineUIPro.Web.AttachFile
{
newurl = Fileurl;
}
if (AttachFileService.IsImage(FiletExtension))
if (AttachFileService.IsImage(FiletExtension) && 1 > 2)
{
this.TabStrip1.Hidden = true;
this.Image1.Hidden = false;

6
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
View File

@ -46,7 +46,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="false" EnableMultiSelect="false">
</f:DropDownList>
<f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
@ -54,13 +54,13 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" MaxLength="50" LabelWidth="110px"
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" MaxLength="50" LabelWidth="110px"
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
</f:DropDownList>

12
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -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;
@ -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;

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

@ -205,7 +205,7 @@
<div class="bw-b-bottom">
<div class="bw-b-bottom-up">
<div class="bw-item-content">
<div id="myDiv" runat="server" style="width: 100%; height: 100%;" ></div>
<div id="myDiv" runat="server" style="width: 100%; height: 100%;"></div>
</div>
</div>
</div>
@ -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,//开启显示

24
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
View File

@ -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<string> listCategories = new List<string>();
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<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
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);
}

18
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
<History>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||;</History>
<History>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||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>03/13/2025 10:58:15</publishTime>
<publishTime>03/13/2025 16:44:23</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>03/13/2025 10:58:15</publishTime>
<publishTime>03/13/2025 16:44:23</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>03/13/2025 10:57:54</publishTime>
<publishTime>03/13/2025 16:44:14</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>03/13/2025 10:57:54</publishTime>
<publishTime>03/13/2025 16:44:14</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>03/13/2025 10:57:58</publishTime>
<publishTime>03/13/2025 16:44:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>03/13/2025 10:57:58</publishTime>
<publishTime>03/13/2025 16:44:14</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>03/13/2025 10:57:57</publishTime>
<publishTime>03/13/2025 16:44:14</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>03/13/2025 10:57:59</publishTime>
<publishTime>03/13/2025 16:44:15</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?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>