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

1

This commit is contained in:
夏菊 2025-03-13 18:17:12 +08:00
parent 8c1cb170b2
commit 521a626865
7 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql
View File

@ -1,11 +0,0 @@
--优化看板加载
create index SitePerson_PersonInOutNow_ChangeTime_ProjectId_index
on dbo.SitePerson_PersonInOutNow (ChangeTime, ProjectId)
go

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

@ -46,7 +46,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <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>
<f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true"> <f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList> </f:DropDownList>
@ -54,13 +54,13 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <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"> EnableCheckBoxSelect="true" EnableEdit="true">
</f:DropDownList> </f:DropDownList>
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true" <f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
LabelWidth="110px"> LabelWidth="110px">
</f:DatePicker> </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" EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true"> OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
</f:DropDownList> </f:DropDownList>

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

@ -90,12 +90,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_Acceptance.SelectedValue == Const._Null) if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_ReceiveID.SelectedValue == Const._Null) if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return; return;
@ -818,12 +818,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_Acceptance.SelectedValue == Const._Null) if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_ReceiveID.SelectedValue == Const._Null) if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return; return;
@ -886,7 +886,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
} }
else else
{ {
var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text); var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{//责任人的时候保存关键事项 {//责任人的时候保存关键事项
@ -1014,12 +1014,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_Acceptance.SelectedValue == Const._Null) if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
return; return;
} }
if (this.DropUser_ReceiveID.SelectedValue == Const._Null) if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null)
{ {
Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning);
return; 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">
<div class="bw-b-bottom-up"> <div class="bw-b-bottom-up">
<div class="bw-item-content"> <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> </div>
</div> </div>
@ -746,7 +746,7 @@
var option = { var option = {
title: { title: {
// left:'center', // left:'center',
text: '关键事项超期平均时间', text: '关键事项超期平均时间统计（单位：天）',
textStyle: { textStyle: {
color: '#1C1C1C', color: '#1C1C1C',
fontSize: 16, fontSize: 16,
@ -756,11 +756,12 @@
}, },
tooltip: {}, tooltip: {},
legend: { legend: {
data: ['关键事项超期平均时间'],
left: '3%', left: '3%',
show: true, show: true,
selectedMode: false, selectedMode: false,
textStyle: {//图例文字的样式 textStyle: {//图例文字的样式
color: '#1C1C1C', //color: '#1C1C1C',
fontSize: 16, fontSize: 16,
fontWeight: 700 fontWeight: 700
} }
@ -842,10 +843,11 @@
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.setOption(option) myChart.setOption(option)
} }
var four =<%=Four %>; var four =<%=Four %>;
var xArr = four.categories; var xArr = four.categories;
var series = [{ var series = [{
name: '关键事项超期平均时间统计（单位：天）', name: '关键事项超期平均时间',
type: 'bar', type: 'bar',
barWidth: 30, barWidth: 30,
barGap: 0, barGap: 0,
@ -858,6 +860,7 @@
label: { show: true, position: "middle" }, label: { show: true, position: "middle" },
lineStyle: { lineStyle: {
type: "dashed", type: "dashed",
width: 2,
color: "#3c78d8" color: "#3c78d8"
} }
}, },
@ -867,10 +870,12 @@
label: { show: true, position: "middle" }, label: { show: true, position: "middle" },
lineStyle: { lineStyle: {
type: "dashed", type: "dashed",
width: 2,
color: "#FF0000" color: "#FF0000"
} }
} }
] ],
symbol: ['none', 'none']//标记线箭头
}, },
label: { //柱体上显示数值 label: { //柱体上显示数值
show: true,//开启显示 show: true,//开启显示

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

@ -481,7 +481,7 @@ namespace FineUIPro.Web
double averageTypeDiffDay = 0; double averageTypeDiffDay = 0;
if (typelst.Any()) if (typelst.Any())
{ {
averageTypeDiffDay = typelst.Average(p => p.DiffDay); averageTypeDiffDay = Math.Round(typelst.Average(p => p.DiffDay), 1);
} }
listdata.Add(averageTypeDiffDay); 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"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl> <_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-03-13T07:31:10.3223071Z||;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> <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 /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>03/13/2025 15:31:08</publishTime> <publishTime>03/13/2025 16:44:23</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>03/13/2025 15:31:08</publishTime> <publishTime>03/13/2025 16:44:23</publishTime>
</File> </File>
<File Include="bin/Aspose.Words.dll"> <File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime> <publishTime>12/06/2024 20:13:58</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>03/13/2025 15:30:45</publishTime> <publishTime>03/13/2025 16:44:14</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime> <publishTime>12/26/2024 09:46:52</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>03/13/2025 15:30:45</publishTime> <publishTime>03/13/2025 16:44:14</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime> <publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime> <publishTime>02/09/2013 00:42:28</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>03/13/2025 15:30:49</publishTime> <publishTime>03/13/2025 16:44:14</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>03/13/2025 15:30:49</publishTime> <publishTime>03/13/2025 16:44:14</publishTime>
</File> </File>
<File Include="bin/WebAPI.xml"> <File Include="bin/WebAPI.xml">
<publishTime>03/13/2025 15:30:49</publishTime> <publishTime>03/13/2025 16:44:14</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime> <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>03/13/2025 15:30:51</publishTime> <publishTime>03/13/2025 16:44:15</publishTime>
</File> </File>
<File Include="Scripts/bootstrap.js"> <File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>

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

@ -1,7 +1,7 @@
<?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"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />