From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示

---
 SourceCode/Bond/BondEq/BondEq.vcxproj |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index a8fc121..432fb35 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7864134E-C538-4C0F-AF24-215FFCCBBAB4}</ProjectGuid>
     <RootNamespace>BondServo</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
     <Keyword>MFCProj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -43,14 +43,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
@@ -191,6 +191,8 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="AlarmPopupDlg.h" />
+    <ClInclude Include="CBaseDlg.h" />
     <ClInclude Include="CComponentDlg.h" />
     <ClInclude Include="CComponentPLCDlg.h" />
     <ClInclude Include="CPLC.h" />
@@ -210,6 +212,7 @@
     <ClInclude Include="CPanel.h" />
     <ClInclude Include="CParam.h" />
     <ClInclude Include="CProjectPageComponents.h" />
+    <ClInclude Include="CProjectPageMain.h" />
     <ClInclude Include="CRemoteEqUnitView.h" />
     <ClInclude Include="CRemoteEqView.h" />
     <ClInclude Include="CHomeDialog.h" />
@@ -219,6 +222,7 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="Configuration.h" />
     <ClInclude Include="CPanelProject.h" />
+    <ClInclude Include="DBManager\AlarmManager.h" />
     <ClInclude Include="DBManager\AxisManager.h" />
     <ClInclude Include="DBManager\SystemLogManager.h" />
     <ClInclude Include="DBManager\UserManager.h" />
@@ -244,6 +248,7 @@
     <ClInclude Include="Model.h" />
     <ClInclude Include="CPageAlarm.h" />
     <ClInclude Include="Recipe.h" />
+    <ClInclude Include="RegexEdit.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="SetPage1.h" />
     <ClInclude Include="SetPage2.h" />
@@ -255,14 +260,18 @@
     <ClInclude Include="ToolUnits.h" />
     <ClInclude Include="TopToolbar.h" />
     <ClInclude Include="VerticalLine.h" />
+    <ClInclude Include="View\AxisDetailSettingsDlg.h" />
     <ClInclude Include="View\AxisSettingsDlg.h" />
     <ClInclude Include="View\ChangePasswordDlg.h" />
     <ClInclude Include="View\IOMonitoringDlg.h" />
     <ClInclude Include="View\LoginDlg.h" />
+    <ClInclude Include="View\RecipeListDlg.h" />
     <ClInclude Include="View\SystemLogManagerDlg.h" />
     <ClInclude Include="View\UserManagerDlg.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="AlarmPopupDlg.cpp" />
+    <ClCompile Include="CBaseDlg.cpp" />
     <ClCompile Include="CComponentDlg.cpp" />
     <ClCompile Include="CComponentPLCDlg.cpp" />
     <ClCompile Include="CPLC.cpp" />
@@ -282,6 +291,7 @@
     <ClCompile Include="CPanel.cpp" />
     <ClCompile Include="CParam.cpp" />
     <ClCompile Include="CProjectPageComponents.cpp" />
+    <ClCompile Include="CProjectPageMain.cpp" />
     <ClCompile Include="CRemoteEqUnitView.cpp" />
     <ClCompile Include="CRemoteEqView.cpp" />
     <ClCompile Include="CHomeDialog.cpp" />
@@ -290,6 +300,7 @@
     <ClCompile Include="CProjectPageRemoteEqs.cpp" />
     <ClCompile Include="Configuration.cpp" />
     <ClCompile Include="CPanelProject.cpp" />
+    <ClCompile Include="DBManager\AlarmManager.cpp" />
     <ClCompile Include="DBManager\AxisManager.cpp" />
     <ClCompile Include="DBManager\SystemLogManager.cpp" />
     <ClCompile Include="DBManager\UserManager.cpp" />
@@ -316,6 +327,7 @@
     <ClCompile Include="Model.cpp" />
     <ClCompile Include="CPageAlarm.cpp" />
     <ClCompile Include="Recipe.cpp" />
+    <ClCompile Include="RegexEdit.cpp" />
     <ClCompile Include="SetPage1.cpp" />
     <ClCompile Include="SetPage2.cpp" />
     <ClCompile Include="SettingsDlg.cpp" />
@@ -331,10 +343,12 @@
     <ClCompile Include="ToolUnits.cpp" />
     <ClCompile Include="TopToolbar.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
+    <ClCompile Include="View\AxisDetailSettingsDlg.cpp" />
     <ClCompile Include="View\AxisSettingsDlg.cpp" />
     <ClCompile Include="View\ChangePasswordDlg.cpp" />
     <ClCompile Include="View\IOMonitoringDlg.cpp" />
     <ClCompile Include="View\LoginDlg.cpp" />
+    <ClCompile Include="View\RecipeListDlg.cpp" />
     <ClCompile Include="View\SystemLogManagerDlg.cpp" />
     <ClCompile Include="View\UserManagerDlg.cpp" />
   </ItemGroup>
@@ -355,7 +369,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties RESOURCE_FILE="BondServo.rc" />
+      <UserProperties RESOURCE_FILE="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3