From c42e01627d34dc2ff3d18cc47b2018de3dbef36d Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期五, 25 七月 2025 15:15:34 +0800 Subject: [PATCH] 计件工资样式调整 --- DevApp/Gs.DevApp/App.config | 52 ++++++++++++++++++++++------------------------------ 1 files changed, 22 insertions(+), 30 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index 2912061..b236262 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -7,7 +7,6 @@ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </sectionGroup> - <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" /> </configSections> <applicationSettings> <DevExpress.LookAndFeel.Design.AppSettings> @@ -22,15 +21,29 @@ <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <probing privatePath="x86" /> + <dependentAssembly> + <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> <appSettings> - <add key="WebApiUrl" value="http://localhost:5263/"/> - <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> + <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> + <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> + <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> - <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" /> + <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> <add key="Version" value="0.1" /> <add key="IsAutoUpdater" value="0" /> - <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" /> + <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" /> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> @@ -43,14 +56,11 @@ <setting name="remember" serializeAs="String"> <value>False</value> </setting> - <setting name="orgGuid" serializeAs="String"> - <value /> + <setting name="fontSizeName" serializeAs="String"> + <value>瀹嬩綋,10</value> </setting> - <setting name="fontSize" serializeAs="String"> - <value>10</value> - </setting> - <setting name="fontName" serializeAs="String"> - <value>Tahoma</value> + <setting name="isWeight" serializeAs="String"> + <value>False</value> </setting> </Gs.DevApp.Properties.Settings> </userSettings> @@ -66,22 +76,4 @@ </providers> </roleManager> </system.web> - <system.data> - <DbProviderFactories> - <remove invariant="Oracle.ManagedDataAccess.Client" /> - <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" /> - </DbProviderFactories> - </system.data> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" /> - </dependentAssembly> - </assemblyBinding> - </runtime> </configuration> \ No newline at end of file -- Gitblit v1.9.3