From 0a2d917dba66be92bfaa628abee1a5792f0f4e7a Mon Sep 17 00:00:00 2001 From: lg <999544862qq.com> Date: 星期三, 11 九月 2024 11:09:59 +0800 Subject: [PATCH] 日志 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 125 +++++++++++++++++++++++++++++++---------- 1 files changed, 93 insertions(+), 32 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 31f42f1..1b1dd82 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -33,19 +33,36 @@ </PropertyGroup> <ItemGroup> <Reference Include="DevExpress.BonusSkins.v19.2" /> + <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Data.v19.2" /> + <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> + <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.PivotGrid.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Utils.v19.2" /> <Reference Include="DevExpress.Sparkline.v19.2.Core" /> + <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraEditors.v19.2" /> <Reference Include="DevExpress.Printing.v19.2.Core" /> + <Reference Include="DevExpress.XtraGauges.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> + <Reference Include="DevExpress.XtraReports.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.XtraReports.v19.2.Extensions, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> + <Reference Include="FastReport"> + <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath> + </Reference> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> + <Reference Include="PresentationCore" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -64,6 +81,13 @@ <Compile Include="DevFrm\BasicData\FrmMesItems.Designer.cs"> <DependentUpon>FrmMesItems.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\RptUser.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\RptUser.Designer.cs"> + <DependentUpon>RptUser.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sys\FileSelector.cs" /> <Compile Include="DevFrm\FrmLogin.cs"> <SubType>Form</SubType> </Compile> @@ -82,6 +106,18 @@ <Compile Include="DevFrm\Sys\DocNoRule.Designer.cs"> <DependentUpon>DocNoRule.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Sys\EasyCode.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sys\EasyCode.Designer.cs"> + <DependentUpon>EasyCode.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sys\SysLog.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sys\SysLog.Designer.cs"> + <DependentUpon>SysLog.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\User\Organization.cs"> <SubType>Form</SubType> </Compile> @@ -94,23 +130,11 @@ <Compile Include="DevFrm\User\Role.Designer.cs"> <DependentUpon>Role.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\User\RoleAdd.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\User\RoleAdd.Designer.cs"> - <DependentUpon>RoleAdd.cs</DependentUpon> - </Compile> <Compile Include="DevFrm\User\SysMenu.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\User\SysMenu.Designer.cs"> <DependentUpon>SysMenu.cs</DependentUpon> - </Compile> - <Compile Include="DevFrm\User\SysMenuAdd.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\User\SysMenuAdd.Designer.cs"> - <DependentUpon>SysMenuAdd.cs</DependentUpon> </Compile> <Compile Include="DevFrm\User\User.cs"> <SubType>Form</SubType> @@ -118,16 +142,22 @@ <Compile Include="DevFrm\User\User.Designer.cs"> <DependentUpon>User.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\User\UserAdd.cs"> + <Compile Include="DevFrm\User\UserSelectRole.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="DevFrm\User\UserAdd.Designer.cs"> - <DependentUpon>UserAdd.cs</DependentUpon> + <Compile Include="DevFrm\User\UserSelectRole.Designer.cs"> + <DependentUpon>UserSelectRole.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\User\UserSetPwd.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\User\UserSetPwd.Designer.cs"> + <DependentUpon>UserSetPwd.cs</DependentUpon> + </Compile> + <Compile Include="Entity\LoginInfoModel.cs" /> <Compile Include="Entity\MesItems.cs" /> - <Compile Include="Models\LoginInfoModel.cs" /> - <Compile Include="Models\PageQueryModel.cs" /> - <Compile Include="Models\ReturnModel.cs" /> + <Compile Include="Entity\PageQueryModel.cs" /> + <Compile Include="Entity\ReturnModel.cs" /> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources1.Designer.cs"> @@ -137,11 +167,23 @@ </Compile> <Compile Include="Query\MesItemQuery.cs" /> <Compile Include="Service\MesItemServices.cs" /> - <Compile Include="TestForm\TEST.cs"> + <Compile Include="TestForm\print.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="TestForm\TEST.Designer.cs"> - <DependentUpon>TEST.cs</DependentUpon> + <Compile Include="TestForm\print.Designer.cs"> + <DependentUpon>print.cs</DependentUpon> + </Compile> + <Compile Include="TestForm\t1.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="TestForm\t1.Designer.cs"> + <DependentUpon>t1.cs</DependentUpon> + </Compile> + <Compile Include="TestForm\test.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="TestForm\test.Designer.cs"> + <DependentUpon>test.cs</DependentUpon> </Compile> <Compile Include="TestForm\XtraForm1.cs"> <SubType>Form</SubType> @@ -180,8 +222,17 @@ <EmbeddedResource Include="DevFrm\FrmMain.resx"> <DependentUpon>FrmMain.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\RptUser.resx"> + <DependentUpon>RptUser.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\DocNoRule.resx"> <DependentUpon>DocNoRule.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sys\EasyCode.resx"> + <DependentUpon>EasyCode.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sys\SysLog.resx"> + <DependentUpon>SysLog.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\User\Organization.resx"> <DependentUpon>Organization.cs</DependentUpon> @@ -189,28 +240,30 @@ <EmbeddedResource Include="DevFrm\User\Role.resx"> <DependentUpon>Role.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="DevFrm\User\RoleAdd.resx"> - <DependentUpon>RoleAdd.cs</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="DevFrm\User\SysMenu.resx"> <DependentUpon>SysMenu.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="DevFrm\User\SysMenuAdd.resx"> - <DependentUpon>SysMenuAdd.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\User\User.resx"> <DependentUpon>User.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="DevFrm\User\UserAdd.resx"> - <DependentUpon>UserAdd.cs</DependentUpon> + <EmbeddedResource Include="DevFrm\User\UserSelectRole.resx"> + <DependentUpon>UserSelectRole.cs</DependentUpon> </EmbeddedResource> - <None Include="Properties\licenses.licx" /> + <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx"> + <DependentUpon>UserSetPwd.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources1.Designer.cs</LastGenOutput> </EmbeddedResource> - <EmbeddedResource Include="TestForm\TEST.resx"> - <DependentUpon>TEST.cs</DependentUpon> + <EmbeddedResource Include="TestForm\print.resx"> + <DependentUpon>print.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="TestForm\t1.resx"> + <DependentUpon>t1.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="TestForm\test.resx"> + <DependentUpon>test.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="TestForm\XtraForm1.resx"> <DependentUpon>XtraForm1.cs</DependentUpon> @@ -288,6 +341,14 @@ <None Include="Resources\bouser_16x16.png" /> <None Include="Resources\salesperiodlifetime_32x32.png" /> <None Include="Resources\salesperiodlifetime_16x16.png" /> + <None Include="Resources\encryptdocument_32x32.png" /> + <None Include="Resources\saveall_32x32.png" /> + <None Include="Resources\editrangepermission_32x32.png" /> + <None Include="Resources\editrangepermission_16x16.png" /> + <None Include="Resources\encryptdocument_32x321.png" /> + <None Include="Resources\bouser_16x161.png" /> + <None Include="Resources\csharp_16x16.png" /> + <None Include="Resources\formatnumbertime_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup> -- Gitblit v1.9.3