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

1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
+3 -3
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>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+7 -7
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;
@@ -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;
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx
+10 -5
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,//开启显示
SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs
+1 -1
View File
@@ -481,7 +481,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);
}