kuangjiadajian
This commit is contained in:
parent
7a62a285eb
commit
dcaf4e490e
@ -5,16 +5,11 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Prism.Core" Version="8.1.97" />
|
|
||||||
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
|
|
||||||
<PackageReference Include="Unity" Version="5.11.10" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.Common\RIZO.Client.Common.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Common\RIZO.Client.Common.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.IBLL\RIZO.Client.IBLL.csproj" />
|
<ProjectReference Include="..\RIZO.Client.IBLL\RIZO.Client.IBLL.csproj" />
|
||||||
|
<ProjectReference Include="..\RIZO.Client.Infrastructure\RIZO.Client.Infrastructure.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
27
Client/RIZO.Client.BusinessModule/BusinessModule.cs
Normal file
27
Client/RIZO.Client.BusinessModule/BusinessModule.cs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
using Prism.Ioc;
|
||||||
|
using Prism.Modularity;
|
||||||
|
using Prism.Regions;
|
||||||
|
using RIZO.Client.BusinessModule.View;
|
||||||
|
|
||||||
|
namespace RIZO.Client.BusinessModule
|
||||||
|
{
|
||||||
|
public class BusinessModule : IModule
|
||||||
|
{
|
||||||
|
public void OnInitialized(IContainerProvider containerProvider)
|
||||||
|
{
|
||||||
|
// 初始化的时候,添加一个组件到对应的区域
|
||||||
|
// 比如 左侧菜单
|
||||||
|
// 需要一个RegionManager
|
||||||
|
|
||||||
|
var regionManager = containerProvider.Resolve<IRegionManager>();
|
||||||
|
regionManager.RegisterViewWithRegion("MainContentRegion", typeof(ReportWorkView));
|
||||||
|
//regionManager.RegisterViewWithRegion("MainHeaderRegion", typeof(Views.MainHeaderView));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterTypes(IContainerRegistry containerRegistry)
|
||||||
|
{
|
||||||
|
containerRegistry.Register<ReportWorkView>();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net5.0-windows</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<UseWPF>true</UseWPF>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Models\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\RIZO.Client.Common\RIZO.Client.Common.csproj" />
|
||||||
|
<ProjectReference Include="..\RIZO.Client.Infrastructure\RIZO.Client.Infrastructure.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
18
Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml
Normal file
18
Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<UserControl x:Class="RIZO.Client.BusinessModule.View.ReportWorkView"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="clr-namespace:RIZO.Client.BusinessModule.View"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
d:DesignHeight="450" d:DesignWidth="800"
|
||||||
|
xmlns:prism="http://prismlibrary.com/"
|
||||||
|
prism:ViewModelLocator.AutoWireViewModel="True"
|
||||||
|
Background="red"
|
||||||
|
>
|
||||||
|
<Grid>
|
||||||
|
|
||||||
|
|
||||||
|
<TextBlock Text="上海干巷车镜实业有限公司产线线边屏" VerticalAlignment="Center" FontSize="20" Margin="20,0,0,0"/>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Navigation;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
|
||||||
|
namespace RIZO.Client.BusinessModule.View
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// ReportWorkView.xaml 的交互逻辑
|
||||||
|
/// </summary>
|
||||||
|
public partial class ReportWorkView : UserControl
|
||||||
|
{
|
||||||
|
public ReportWorkView()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
using Prism.Mvvm;
|
||||||
|
using Prism.Regions;
|
||||||
|
using Prism.Services.Dialogs;
|
||||||
|
using RIZO.Client.Common;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Unity;
|
||||||
|
|
||||||
|
namespace RIZO.Client.BusinessModule.ViewModels
|
||||||
|
{
|
||||||
|
public class ReportWorkViewModel : BindableBase
|
||||||
|
{
|
||||||
|
public string PageTitle { set; get; } = "工单123123";
|
||||||
|
//public ReportWorkViewModel(IUnityContainer unityContainer, IRegionManager regionManager)
|
||||||
|
// : base(unityContainer, regionManager)
|
||||||
|
//{
|
||||||
|
// this.PageTitle = "工单123123";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//}
|
||||||
|
public ReportWorkViewModel()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net5.0-windows</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<UseWPF>true</UseWPF>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Prism.Core" Version="8.1.97" />
|
||||||
|
<PackageReference Include="Prism.Unity" Version="8.1.97" />
|
||||||
|
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -5,14 +5,10 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Prism.Core" Version="8.1.97" />
|
|
||||||
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.Entity\RIZO.Client.Entity.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Entity\RIZO.Client.Entity.csproj" />
|
||||||
|
<ProjectReference Include="..\RIZO.Client.Infrastructure\RIZO.Client.Infrastructure.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -8,6 +8,7 @@ using RIZO.Client.DAL;
|
|||||||
using RIZO.Client.IBLL;
|
using RIZO.Client.IBLL;
|
||||||
using RIZO.Client.IDAL;
|
using RIZO.Client.IDAL;
|
||||||
using RIZO.Client.Start.Views;
|
using RIZO.Client.Start.Views;
|
||||||
|
using RIZO.Client.BusinessModule;
|
||||||
|
|
||||||
namespace RIZO.Client.Start
|
namespace RIZO.Client.Start
|
||||||
{
|
{
|
||||||
@ -52,6 +53,7 @@ namespace RIZO.Client.Start
|
|||||||
// 可以改为自动扫描
|
// 可以改为自动扫描
|
||||||
moduleCatalog.AddModule<MainModule.MainModule>();
|
moduleCatalog.AddModule<MainModule.MainModule>();
|
||||||
moduleCatalog.AddModule<BaseModule.BaseInfoModule>();
|
moduleCatalog.AddModule<BaseModule.BaseInfoModule>();
|
||||||
|
moduleCatalog.AddModule<BusinessModule.BusinessModule>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,21 +6,16 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
|
||||||
<PackageReference Include="Prism.Core" Version="8.1.97" />
|
|
||||||
<PackageReference Include="Prism.Unity" Version="8.1.97" />
|
|
||||||
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Assets\RIZO.Client.Assets.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.BaseModule\RIZO.Client.BaseModule.csproj" />
|
<ProjectReference Include="..\RIZO.Client.BaseModule\RIZO.Client.BaseModule.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.BLL\RIZO.Client.BLL.csproj" />
|
<ProjectReference Include="..\RIZO.Client.BLL\RIZO.Client.BLL.csproj" />
|
||||||
|
<ProjectReference Include="..\RIZO.Client.BusinessModule\RIZO.Client.BusinessModule.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.Common\RIZO.Client.Common.csproj" />
|
<ProjectReference Include="..\RIZO.Client.Common\RIZO.Client.Common.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.DAL\RIZO.Client.DAL.csproj" />
|
<ProjectReference Include="..\RIZO.Client.DAL\RIZO.Client.DAL.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.IBLL\RIZO.Client.IBLL.csproj" />
|
<ProjectReference Include="..\RIZO.Client.IBLL\RIZO.Client.IBLL.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.IDAL\RIZO.Client.IDAL.csproj" />
|
<ProjectReference Include="..\RIZO.Client.IDAL\RIZO.Client.IDAL.csproj" />
|
||||||
|
<ProjectReference Include="..\RIZO.Client.Infrastructure\RIZO.Client.Infrastructure.csproj" />
|
||||||
<ProjectReference Include="..\RIZO.Client.MainModule\RIZO.Client.MainModule.csproj" />
|
<ProjectReference Include="..\RIZO.Client.MainModule\RIZO.Client.MainModule.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
<!--内容标签样式-->
|
||||||
<Style TargetType="TabItem">
|
<Style TargetType="TabItem">
|
||||||
<Setter Property="Header" Value="{Binding DataContext.PageTitle}"/>
|
<Setter Property="Header" Value="{Binding DataContext.PageTitle}"/>
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
@ -94,7 +94,9 @@
|
|||||||
<RowDefinition Height="70"/>
|
<RowDefinition Height="70"/>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
<!--内容页标签区域-->
|
||||||
<ContentControl prism:RegionManager.RegionName="MainHeaderRegion"/>
|
<ContentControl prism:RegionManager.RegionName="MainHeaderRegion"/>
|
||||||
|
<!--内容区域-->
|
||||||
<TabControl prism:RegionManager.RegionName="MainContentRegion" Grid.Row="1"
|
<TabControl prism:RegionManager.RegionName="MainContentRegion" Grid.Row="1"
|
||||||
BorderThickness="0,1,0,0">
|
BorderThickness="0,1,0,0">
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.13.35919.96 d17.13
|
VisualStudioVersion = 17.13.35919.96
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B7C48DCA-5E52-4E3D-A2C4-D306EE2351C9}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B7C48DCA-5E52-4E3D-A2C4-D306EE2351C9}"
|
||||||
EndProject
|
EndProject
|
||||||
@ -69,6 +69,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Infrastructure", "5.Infra
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RIZO.Server.Infrastructure", "Server\RIZO.Server.Infrastructure\RIZO.Server.Infrastructure\RIZO.Server.Infrastructure.csproj", "{95E9C5C4-A076-9778-A99F-D0EA20D53E17}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RIZO.Server.Infrastructure", "Server\RIZO.Server.Infrastructure\RIZO.Server.Infrastructure\RIZO.Server.Infrastructure.csproj", "{95E9C5C4-A076-9778-A99F-D0EA20D53E17}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RIZO.Client.BusinessModule", "Client\RIZO.Client.BusinessModule\RIZO.Client.BusinessModule.csproj", "{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7.Infrastructure", "7.Infrastructure", "{35DCEEDC-4DBF-4DF1-AC0A-2B6598AB073F}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RIZO.Client.Infrastructure", "Client\RIZO.Client.Infrastructure\RIZO.Client.Infrastructure.csproj", "{85605235-5C2C-42DA-884B-A3504C6B4BC6}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -155,6 +161,14 @@ Global
|
|||||||
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Release|Any CPU.Build.0 = Release|Any CPU
|
{95E9C5C4-A076-9778-A99F-D0EA20D53E17}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{85605235-5C2C-42DA-884B-A3504C6B4BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{85605235-5C2C-42DA-884B-A3504C6B4BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{85605235-5C2C-42DA-884B-A3504C6B4BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{85605235-5C2C-42DA-884B-A3504C6B4BC6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@ -191,6 +205,9 @@ Global
|
|||||||
{AE2940FA-3909-4772-96F5-936954E76DEF} = {BBEE74D1-0558-4225-874D-91301F894430}
|
{AE2940FA-3909-4772-96F5-936954E76DEF} = {BBEE74D1-0558-4225-874D-91301F894430}
|
||||||
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {E3C79128-5BE4-40F5-AF0D-F9469C2388A6}
|
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {E3C79128-5BE4-40F5-AF0D-F9469C2388A6}
|
||||||
{95E9C5C4-A076-9778-A99F-D0EA20D53E17} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
{95E9C5C4-A076-9778-A99F-D0EA20D53E17} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||||
|
{4EB23822-18E4-462C-BE2E-5FF6CB8AB43E} = {BBEE74D1-0558-4225-874D-91301F894430}
|
||||||
|
{35DCEEDC-4DBF-4DF1-AC0A-2B6598AB073F} = {B7C48DCA-5E52-4E3D-A2C4-D306EE2351C9}
|
||||||
|
{85605235-5C2C-42DA-884B-A3504C6B4BC6} = {35DCEEDC-4DBF-4DF1-AC0A-2B6598AB073F}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {70B1E247-A3BA-4978-900D-2A4ECCD99389}
|
SolutionGuid = {70B1E247-A3BA-4978-900D-2A4ECCD99389}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user