From fe2aa4880d5c9fd88088ad0ed81ebaca05629f5f Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 17:59:45 +0800
Subject: [PATCH] feat: 集成CAN驱动/模拟器 + 仪器仪表注册/硬件调试模块
---
HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
index 452376a..360439f 100644
--- a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
+++ b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
@@ -74,9 +74,6 @@
<Reference Include="Panuon.WPF.UI, Version=1.3.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\WPFProject\packages\Panuon.WPF.UI.1.3.0.2\lib\net472\Panuon.WPF.UI.dll</HintPath>
</Reference>
- <Reference Include="SimensDriver">
- <HintPath>..\Libs\SimensDriver.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
@@ -95,10 +92,17 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Page Include="SimpleAlarm.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="AlarmInfoManage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Compile Include="SimpleAlarm.xaml.cs">
+ <DependentUpon>SimpleAlarm.xaml</DependentUpon>
+ </Compile>
<Compile Include="AlarmInfoManage.xaml.cs">
<DependentUpon>AlarmInfoManage.xaml</DependentUpon>
<SubType>Code</SubType>
@@ -124,8 +128,6 @@
<DependentUpon>AlarmSettingList.xaml</DependentUpon>
</Compile>
<Compile Include="Entity\AimSetting.cs" />
- <Compile Include="Entity\AlarmSetting.cs" />
- <Compile Include="Entity\AlarmText.cs" />
<Compile Include="Modal\AlarmSettingModal.xaml.cs">
<DependentUpon>AlarmSettingModal.xaml</DependentUpon>
</Compile>
@@ -155,6 +157,14 @@
</None>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\S7Driver\S7Driver.csproj">
+ <Project>{628ef12b-9ed2-4b20-950f-dc3ecc3fd15f}</Project>
+ <Name>S7Driver</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\ConnectionUtil\ConnectionUtil.csproj">
+ <Project>{d0806fa6-3f6d-4304-81b8-ead9da7cb5b2}</Project>
+ <Name>ConnectionUtil</Name>
+ </ProjectReference>
<ProjectReference Include="..\HMI.Base\HMI.Base.csproj">
<Project>{2a6f9720-a890-4036-9d73-41a0dae28341}</Project>
<Name>HMI.Base</Name>
@@ -167,6 +177,14 @@
<Project>{f17de6b5-af1d-48c6-94a0-6b763a6546a6}</Project>
<Name>HMI.UI</Name>
</ProjectReference>
+ <ProjectReference Include="..\HMI.Util\HMI.Util.csproj">
+ <Project>{AFEA100A-9223-448D-AB10-3015D93DD98C}</Project>
+ <Name>HMI.Util</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\OPCClient\OPCClient.csproj">
+ <Project>{E5740BB5-9FC6-4A20-B7C2-CC90C281ED05}</Project>
+ <Name>OPCClient</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--
Gitblit v1.9.1