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:
毕文静 2024-04-29 19:14:06 +08:00
parent a3e123957d 7a51a9642f
commit 3b39bf3074
4 changed files with 815 additions and 1128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -1055,17 +1055,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{ {
DataTable source = ObjectToTable(Grid9.DataSource); DataTable source = ObjectToTable(Grid9.DataSource);
int Quantity1Total = 0, Quantity2Total = 0; int Quantity1Total = 0, Quantity2Total = 0;
foreach (DataRow row in source.Rows) if (source!=null)
{ {
Quantity1Total += Convert.ToInt32(row["Quantity1"]); foreach (DataRow row in source.Rows)
Quantity2Total += Convert.ToInt32(row["Quantity2"]); {
Quantity1Total += Convert.ToInt32(row["Quantity1"]);
Quantity2Total += Convert.ToInt32(row["Quantity2"]);
}
JObject summary = new JObject();
summary.Add("UnitOrMajor", "合计");
summary.Add("Quantity1", Quantity1Total.ToString());
summary.Add("Quantity2", Quantity2Total.ToString());
Grid9.SummaryData = summary;
} }
JObject summary = new JObject();
summary.Add("UnitOrMajor", "合计");
summary.Add("Quantity1", Quantity1Total.ToString());
summary.Add("Quantity2", Quantity2Total.ToString());
Grid9.SummaryData = summary;
} }
public static DataTable ObjectToTable(object obj) public static DataTable ObjectToTable(object obj)

4
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>--> <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/> <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/> <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"/> <compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/> <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/> <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

4
SGGL/FineUIPro.Web/common/main_new.aspx
View File

@ -107,8 +107,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="y_box"> <div class="y_box js-hover" data-type="GJSX">
<div class="y_box_label y_image_default">关键事项 <span class="y_more js-hover" data-type="GJSX">更多></span></div> <div class="y_box_label y_image_default">关键事项 <span class="y_more">更多></span></div>
<div class="y_box_main"> <div class="y_box_main">
<!-- <div class="y_aq y_row" style="margin-top: .25rem;"> <!-- <div class="y_aq y_row" style="margin-top: .25rem;">
<div class="y_aq_box y_image_default y_row"> <div class="y_aq_box y_image_default y_row">

1913
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff