lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-28 10:59:50 +08:00
parent de0a1d28d3
commit db46ed8cd1
18 changed files with 402 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
+1 -88
View File
@@ -436,94 +436,7 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum1') {
var TotalNum = me.getCellValue(rowId, 'TotalNum');
var TotalCompleteNum1 = me.getCellValue(rowId, 'TotalCompleteNum1');
if (TotalNum.toString() != "" && TotalCompleteNum1.toString() != "") {
if (TotalNum !== "0") {
me.updateCellValue(rowId, 'TotalRate1', (TotalCompleteNum1 / TotalNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalRate1', (""));
}
}
}
if (columnId === 'TotalNum' || columnId === 'TotalCompleteNum2') {
var TotalNum = me.getCellValue(rowId, 'TotalNum');
var TotalCompleteNum2 = me.getCellValue(rowId, 'TotalCompleteNum2');
if (TotalNum.toString() != "" && TotalCompleteNum2.toString() != "") {
if (TotalNum !== "0") {
me.updateCellValue(rowId, 'TotalRate2', (TotalCompleteNum2 / TotalNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalRate2', (""));
}
}
}
if (columnId === 'FilmNum' || columnId === 'NotOKFileNum') {
var FilmNum = me.getCellValue(rowId, 'FilmNum');
var NotOKFileNum = me.getCellValue(rowId, 'NotOKFileNum');
if (FilmNum.toString() != "" && NotOKFileNum.toString() != "") {
if (FilmNum !== "0") {
me.updateCellValue(rowId, 'OneOKRate', ((FilmNum - NotOKFileNum) / FilmNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'OneOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalFilmNum' || columnId === 'TotalNotOKFileNum') {
var TotalFilmNum = me.getCellValue(rowId, 'TotalFilmNum');
var TotalNotOKFileNum = me.getCellValue(rowId, 'TotalNotOKFileNum');
if (TotalFilmNum.toString() != "" && TotalNotOKFileNum.toString() != "") {
if (TotalFilmNum !== "0") {
me.updateCellValue(rowId, 'TotalOneOKRate', ((TotalFilmNum - TotalNotOKFileNum) / TotalFilmNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalOneOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'ThisPersonNum' || columnId === 'ThisOKPersonNum') {
var ThisPersonNum = me.getCellValue(rowId, 'ThisPersonNum');
var ThisOKPersonNum = me.getCellValue(rowId, 'ThisOKPersonNum');
if (ThisPersonNum.toString() != "" && ThisOKPersonNum.toString() != "") {
if (ThisPersonNum !== "0") {
me.updateCellValue(rowId, 'ThisOKRate', (ThisOKPersonNum / ThisPersonNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'ThisOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalPersonNum' || columnId === 'TotalOKPersonNum') {
var TotalPersonNum = me.getCellValue(rowId, 'TotalPersonNum');
var TotalOKPersonNum = me.getCellValue(rowId, 'TotalOKPersonNum');
if (TotalPersonNum.toString() != "" && TotalOKPersonNum.toString() != "") {
if (TotalPersonNum !== "0") {
me.updateCellValue(rowId, 'TotalOKRate', (TotalOKPersonNum / TotalPersonNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalOKRate', (""));
}
}
updateSummary();
}
if (columnId === 'TotalSpotNum' || columnId === 'TotalSpotOKNum') {
var TotalSpotNum = me.getCellValue(rowId, 'TotalSpotNum');
var TotalSpotOKNum = me.getCellValue(rowId, 'TotalSpotOKNum');
if (TotalSpotNum.toString() != "" && TotalSpotOKNum.toString() != "") {
if (TotalSpotNum !== "0") {
me.updateCellValue(rowId, 'TotalSpotOKRate', ((TotalSpotOKNum) / TotalSpotNum * 100).toFixed(2) + "%");
} else {
me.updateCellValue(rowId, 'TotalSpotOKRate', (""));
}
}
}
updateSummary();
}
function updateSummary() {
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
+35 -83
View File
@@ -144,90 +144,41 @@ namespace FineUIPro.Web.PZHGL.InformationProject
private void OutputSummaryData()
{
//JObject summary = new JObject();
//int filmNum = 0, notOKFileNum = 0, repairFileNum = 0, totalFilmNum = 0, totalNotOKFileNum = 0;
//string oneOKRate = string.Empty, totalOneOKRate = string.Empty;
//foreach (JObject mergedRow in GridNDTCheck.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// if (values["FilmNum"].ToString() != "" && values["NotOKFileNum"].ToString() != "")
// {
// filmNum += values.Value<int>("FilmNum");
// notOKFileNum += values.Value<int>("NotOKFileNum");
// }
// if (values["RepairFileNum"].ToString() != "")
// {
// repairFileNum += values.Value<int>("RepairFileNum");
// }
// if (values["TotalFilmNum"].ToString() != "" && values["TotalNotOKFileNum"].ToString() != "")
// {
// totalFilmNum += values.Value<int>("TotalFilmNum");
// totalNotOKFileNum += values.Value<int>("TotalNotOKFileNum");
// }
//}
//if (filmNum > 0)
//{
// var a = Convert.ToDouble(filmNum - notOKFileNum);
// var b = Convert.ToDouble(filmNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// oneOKRate = result.ToString() + "%";
//}
//if (totalFilmNum > 0)
//{
// var a = Convert.ToDouble(totalFilmNum - totalNotOKFileNum);
// var b = Convert.ToDouble(totalFilmNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// totalOneOKRate = result.ToString() + "%";
//}
//JObject summary1 = new JObject();
//summary1.Add("UnitName", "合计");
//summary1.Add("FilmNum", filmNum);
//summary1.Add("NotOKFileNum", notOKFileNum);
//summary1.Add("RepairFileNum", repairFileNum);
//summary1.Add("OneOKRate", oneOKRate);
//summary1.Add("TotalFilmNum", totalFilmNum);
//summary1.Add("TotalNotOKFileNum", totalNotOKFileNum);
//summary1.Add("TotalOneOKRate", totalOneOKRate);
//GridNDTCheck.SummaryData = summary1;
//int thisPersonNum = 0, thisOKPersonNum = 0, totalPersonNum = 0, totalOKPersonNum = 0;
//string thisOKRate = string.Empty, totalOKRate = string.Empty;
//foreach (JObject mergedRow in GridWelder.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// if (values["ThisPersonNum"].ToString() != "" && values["ThisOKPersonNum"].ToString() != "")
// {
// thisPersonNum += values.Value<int>("ThisPersonNum");
// thisOKPersonNum += values.Value<int>("ThisOKPersonNum");
// }
// if (values["TotalPersonNum"].ToString() != "" && values["TotalOKPersonNum"].ToString() != "")
// {
// totalPersonNum += values.Value<int>("TotalPersonNum");
// totalOKPersonNum += values.Value<int>("TotalOKPersonNum");
// }
//}
//if (thisPersonNum > 0 && thisOKPersonNum > 0)
//{
// var a = Convert.ToDouble(thisOKPersonNum);
// var b = Convert.ToDouble(thisPersonNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// thisOKRate = result.ToString() + "%";
//}
//if (totalPersonNum > 0 && totalOKPersonNum > 0)
//{
// var a = Convert.ToDouble(totalOKPersonNum);
// var b = Convert.ToDouble(totalPersonNum);
// decimal result = decimal.Round(decimal.Parse((a / b * 100).ToString()), 2);
// totalOKRate = result.ToString() + "%";
//}
//summary.Add("UnitName", "合计");
//summary.Add("ThisPersonNum", thisPersonNum);
//summary.Add("ThisOKPersonNum", thisOKPersonNum);
//summary.Add("ThisOKRate", thisOKRate);
//summary.Add("TotalPersonNum", totalPersonNum);
//summary.Add("TotalOKPersonNum", totalOKPersonNum);
//summary.Add("TotalOKRate", totalOKRate);
//GridWelder.SummaryData = summary;
List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ',');
int[] sum1 = new int[list.Count];
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list.Count; i++)
{
sum1[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary1 = new JObject();
summary1.Add("UnitWorkName", "合计");
for (int i = 0; i < list.Count; i++)
{
summary1.Add("Num" + i.ToString(), sum1[i]);
}
Grid1.SummaryData = summary1;
List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ',');
int[] sum2 = new int[list2.Count];
foreach (JObject mergedRow in Grid2.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list2.Count; i++)
{
sum2[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary2 = new JObject();
summary2.Add("UnitWorkName", "合计");
for (int i = 0; i < list2.Count; i++)
{
summary2.Add("Num" + i.ToString(), sum2[i]);
}
Grid2.SummaryData = summary2;
}
#region 加载树装置-单位-工作区
@@ -613,6 +564,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.Grid5.DataBind();
}
ChangeText();
OutputSummaryData();
}
}
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
+2 -2
View File
@@ -96,7 +96,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="作业人员人数" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogPersonId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogPersonId"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogPersonId" EnableSummary="true" SummaryPosition="Flow"
SortField="ConstructionLogPersonId" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
@@ -116,7 +116,7 @@
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="机械数量" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogMachineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogMachineId"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogMachineId" EnableSummary="true" SummaryPosition="Flow"
SortField="ConstructionLogMachineId" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
+40
View File
@@ -107,6 +107,45 @@ namespace FineUIPro.Web.PZHGL.InformationProject
}
#endregion
private void OutputSummaryData()
{
List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ',');
int[] sum1 = new int[list.Count];
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list.Count; i++)
{
sum1[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary1 = new JObject();
summary1.Add("UnitWorkName", "合计");
for (int i = 0; i < list.Count; i++)
{
summary1.Add("Num" + i.ToString(), sum1[i]);
}
Grid1.SummaryData = summary1;
List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ',');
int[] sum2 = new int[list2.Count];
foreach (JObject mergedRow in Grid2.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list2.Count; i++)
{
sum2[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary2 = new JObject();
summary2.Add("UnitWorkName", "合计");
for (int i = 0; i < list2.Count; i++)
{
summary2.Add("Num" + i.ToString(), sum2[i]);
}
Grid2.SummaryData = summary2;
}
#region 加载
/// <summary>
/// 加载页面
@@ -546,6 +585,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.Grid5.DataSource = records;
this.Grid5.DataBind();
}
OutputSummaryData();
}
}
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
+2 -2
View File
@@ -102,7 +102,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="作业人员人数" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogPersonId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogPersonId"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogPersonId" EnableSummary="true" SummaryPosition="Flow"
SortField="ConstructionLogPersonId" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
@@ -122,7 +122,7 @@
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="机械数量" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ConstructionLogMachineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogMachineId"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ConstructionLogMachineId" EnableSummary="true" SummaryPosition="Flow"
SortField="ConstructionLogMachineId" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
+41
View File
@@ -111,6 +111,45 @@ namespace FineUIPro.Web.PZHGL.InformationProject
}
#endregion
private void OutputSummaryData()
{
List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ',');
int[] sum1 = new int[list.Count];
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list.Count; i++)
{
sum1[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary1 = new JObject();
summary1.Add("UnitWorkName", "合计");
for (int i = 0; i < list.Count; i++)
{
summary1.Add("Num" + i.ToString(), sum1[i]);
}
Grid1.SummaryData = summary1;
List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ',');
int[] sum2 = new int[list2.Count];
foreach (JObject mergedRow in Grid2.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
for (int i = 0; i < list2.Count; i++)
{
sum2[i] += Funs.GetNewIntOrZero(values.Value<string>("Num" + i.ToString()));
}
}
JObject summary2 = new JObject();
summary2.Add("UnitWorkName", "合计");
for (int i = 0; i < list2.Count; i++)
{
summary2.Add("Num" + i.ToString(), sum2[i]);
}
Grid2.SummaryData = summary2;
}
#region 加载
/// <summary>
/// 加载页面
@@ -364,6 +403,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.GridCQMSTomorrowPlan.DataBind();
}
ChangeText();
OutputSummaryData();
}
}
@@ -509,6 +549,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.Grid5.DataBind();
drpUnitWork_SelectedIndexChanged(null, null);
ChangeText();
OutputSummaryData();
}
private void TextEmpty()