提交代码
This commit is contained in:
parent
251059799e
commit
c212922780
|
@ -19325,7 +19325,7 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
|
|
@ -110,13 +110,13 @@ namespace FineUIPro.Web.ZHGL.Environmental
|
|||
this.Grid1.DataBind();
|
||||
}
|
||||
SetUnEditableRow();
|
||||
GetData();
|
||||
GetData(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GetRequestEventArgument() == "UPDATE_SUMMARY")
|
||||
{
|
||||
GetData();
|
||||
GetData(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -539,7 +539,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
|
|||
/// <summary>
|
||||
/// 计算方法
|
||||
/// </summary>
|
||||
private void GetData()
|
||||
private void GetData(bool b)
|
||||
{
|
||||
decimal E6 = 0, F6 = 0, E7 = 0, F7 = 0, E8, F8, E9 = 0, F9 = 0, E10 = 0, F10 = 0, E11 = 0, F11 = 0, E12 = 0, F12 = 0, E13 = 0, F13 = 0, E14 = 0, F14 = 0, E15 = 0, F15 = 0, E16 = 0, F16 = 0, E17 = 0, F17 = 0, E18 = 0, F18 = 0, E20 = 0, F20 = 0, E21 = 0, F21 = 0, E22 = 0, F22 = 0,
|
||||
E24 = 0, F24 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41 = 0, F41 = 0,
|
||||
|
@ -562,7 +562,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
|
|||
}
|
||||
this.Grid1.DataSource = items;
|
||||
this.Grid1.DataBind();
|
||||
SetUnEditableRow();
|
||||
if (b)
|
||||
{
|
||||
SetUnEditableRow();
|
||||
}
|
||||
foreach (JObject mergedRow in mergedData)
|
||||
{
|
||||
JObject values = mergedRow.Value<JObject>("values");
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?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>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
Loading…
Reference in New Issue