Merge branch 'master' of https://toscode.gitee.com/frane-yang/sggl_cd
This commit is contained in:
@@ -69,10 +69,10 @@
|
||||
<HintPath>FakesAssemblies\Apache.NMS.Fakes.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Aspose.Words">
|
||||
<HintPath>.\bin\Aspose.Words.dll</HintPath>
|
||||
<HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="AxInterop.SYNCARDOCXLib">
|
||||
<HintPath>.\bin\AxInterop.SYNCARDOCXLib.dll</HintPath>
|
||||
<HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@@ -94,11 +94,11 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ICSharpCode.SharpZipLib">
|
||||
<HintPath>..\..\..\..\ELECO\SGGL_ELECO\SGGL\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WIA">
|
||||
<HintPath>bin\Interop.WIA.dll</HintPath>
|
||||
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
|
||||
<EmbedInteropTypes>False</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
@@ -112,7 +112,7 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
|
||||
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
|
||||
@@ -155,7 +155,7 @@
|
||||
<Reference Include="System.EnterpriseServices" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="ThoughtWorks.QRCode">
|
||||
<HintPath>\bin\ThoughtWorks.QRCode.dll</HintPath>
|
||||
<HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ThoughtWorks.QRCode.Fakes">
|
||||
<HintPath>FakesAssemblies\ThoughtWorks.QRCode.Fakes.dll</HintPath>
|
||||
|
||||
@@ -153,18 +153,14 @@
|
||||
<assemblyIdentity name="Apache.NMS" publicKeyToken="82756feee3957618" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -105,7 +105,7 @@
|
||||
FieldType="String" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="NewWaterConsumption" DataField="NewWaterConsumption" SortField="NewWaterConsumption"
|
||||
FieldType="String" HeaderText="用新水量(万吨)" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
FieldType="String" HeaderText="二氧化碳(万吨)" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="HeadOfficeInspectorGeneralNum" DataField="HeadOfficeInspectorGeneralNum" SortField="HeadOfficeInspectorGeneralNum"
|
||||
FieldType="String" HeaderText="企业总部总监人数" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量(万吨)" LabelWidth="160" NoDecimal="false" DecimalPrecision="4" NoNegative="true">
|
||||
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="二氧化碳(万吨)" LabelWidth="160" NoDecimal="false" DecimalPrecision="4" NoNegative="true">
|
||||
</f:NumberBox>
|
||||
<f:Label runat="server"></f:Label>
|
||||
</Items>
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
FieldType="String" HeaderText="万元营业收入综合能耗" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="NewWaterConsumption" DataField="NewWaterConsumption" SortField="NewWaterConsumption"
|
||||
FieldType="String" HeaderText="用新水量" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
FieldType="String" HeaderText="二氧化碳" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="HeadOfficeInspectorGeneralNum" DataField="HeadOfficeInspectorGeneralNum" SortField="HeadOfficeInspectorGeneralNum"
|
||||
FieldType="String" HeaderText="企业总部总监人数" TextAlign="Left" HeaderTextAlign="Center" >
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量" NoDecimal="true" NoNegative="true">
|
||||
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="二氧化碳" NoDecimal="true" NoNegative="true">
|
||||
</f:NumberBox>
|
||||
<f:NumberBox ID="txtHeadOfficeInspectorGeneralNum" runat="server" Label="企业总部总监人数" NoDecimal="true" NoNegative="true">
|
||||
</f:NumberBox>
|
||||
|
||||
@@ -200,7 +200,7 @@
|
||||
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
|
||||
</div>
|
||||
<div class="ii-item bg5">
|
||||
<div class="desc">用新水量<br/>(万吨)</div>
|
||||
<div class="desc">二氧化碳<br/>(万吨)</div>
|
||||
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
<package id="FastReport.Compat" version="2021.3.0" targetFramework="net461" />
|
||||
<package id="FastReport.OpenSource" version="2022.1.9" targetFramework="net461" />
|
||||
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net461" />
|
||||
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" requireReinstallation="true" />
|
||||
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
|
||||
<package id="NPOI" version="2.5.5" targetFramework="net461" />
|
||||
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
|
||||
<package id="SharpZipLib" version="1.3.3" targetFramework="net461" />
|
||||
<package id="SharpZipLib" version="1.3.2" targetFramework="net461" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user