From 60908c00556f4f53d82f5588ae3013f80c443590 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 14 十一月 2024 17:22:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
index 2aeca59..90cf954 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
@@ -28,8 +28,20 @@
     <None Remove="bimface\css\Panel.css" />
     <None Remove="bimface\css\Tailwind.css" />
     <None Remove="bimface\html\Interop3d.html" />
-    <None Remove="bimface\img\flowEffect.png" />
+    <None Remove="bimface\imgs\CalcuDemand.png" />
+    <None Remove="bimface\imgs\CalcuE.png" />
+    <None Remove="bimface\imgs\CalcuFlow.png" />
+    <None Remove="bimface\imgs\CalcuH.png" />
+    <None Remove="bimface\imgs\CalcuHead.png" />
+    <None Remove="bimface\imgs\CalcuHeadLoss.png" />
+    <None Remove="bimface\imgs\CalcuP.png" />
+    <None Remove="bimface\imgs\CalcuPr.png" />
+    <None Remove="bimface\imgs\CalcuPress.png" />
+    <None Remove="bimface\imgs\CalcuQ.png" />
+    <None Remove="bimface\imgs\CalcuVelocity.png" />
+    <None Remove="bimface\imgs\flowEffect.png" />
     <None Remove="bimface\js\Background.js" />
+    <None Remove="bimface\js\Base64.js" />
     <None Remove="bimface\js\CameraStatus.js" />
     <None Remove="bimface\js\ComponentsBlink.js" />
     <None Remove="bimface\js\ComponentsColor.js" />
@@ -43,6 +55,8 @@
     <None Remove="bimface\js\LogicCalcuCustomLabel.js" />
     <None Remove="bimface\js\LogicFlowEffect.js" />
     <None Remove="bimface\js\LogicMarkLeadLabel.js" />
+    <None Remove="bimface\js\LogicMonitor.js" />
+    <None Remove="bimface\js\Marker3dContainer.js" />
     <None Remove="bimface\js\Panel.js" />
     <None Remove="bimface\js\SelectedComponents.js" />
     <None Remove="bimface\js\WalkThrough.js" />
@@ -59,10 +73,46 @@
     <Content Include="bimface\html\Interop3d.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="bimface\img\flowEffect.png">
+    <Content Include="bimface\imgs\CalcuDemand.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuE.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuFlow.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuH.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuHead.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuHeadLoss.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuP.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuPr.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuPress.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuQ.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\CalcuVelocity.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\imgs\flowEffect.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="bimface\js\Background.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\js\Base64.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="bimface\js\CameraStatus.js">
@@ -98,6 +148,12 @@
     <Content Include="bimface\js\Layer.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="bimface\js\LogicMonitor.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="bimface\js\Marker3dContainer.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="bimface\js\LogicMarkLeadLabel.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

--
Gitblit v1.9.3