Kaynağa Gözat

补充内容

ouruisong 11 ay önce
ebeveyn
işleme
6fb5ae71d9
22 değiştirilmiş dosya ile 695 ekleme ve 831 silme
  1. 40 0
      CollaborativePlatformMain/CADStartUtil/FloorDataConfigUtil.cs
  2. 44 0
      CollaborativePlatformMain/CADStartUtil/OpenDrawPathData.cs
  3. 8 4
      CollaborativePlatformMain/CADStartUtil/StartCADUtil.cs
  4. 168 6
      CollaborativePlatformMain/CollaborativePlatformMain.csproj
  5. 14 6
      CollaborativePlatformMain/Form/HomepageForm.xaml
  6. 35 742
      CollaborativePlatformMain/Form/HomepageForm.xaml.cs
  7. 2 1
      CollaborativePlatformMain/Form/MessageSubPage/FullProfessionPage.xaml
  8. 21 1
      CollaborativePlatformMain/Form/MessageSubPage/FullProfessionPage.xaml.cs
  9. 3 3
      CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml
  10. 29 2
      CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml.cs
  11. 2 3
      CollaborativePlatformMain/Form/MessageSubPage/Project/OperatingFloorPage.xaml
  12. 19 0
      CollaborativePlatformMain/Form/MessageSubPage/Project/OperatingFloorPage.xaml.cs
  13. 25 0
      CollaborativePlatformMain/Form/MessageSubPage/SeconArticleReviewPage.xaml
  14. 37 0
      CollaborativePlatformMain/Form/MessageSubPage/SeconArticleReviewPage.xaml.cs
  15. 31 3
      CollaborativePlatformMain/Form/MessageSubPage/SeconThreeDimensionalPage.xaml
  16. 72 46
      CollaborativePlatformMain/Form/MessageSubPage/SeconThreeDimensionalPage.xaml.cs
  17. 57 9
      CollaborativePlatformMain/Form/UploadDrawingForm.xaml.cs
  18. 12 3
      CollaborativePlatformMain/MainWindow.xaml
  19. 28 2
      CollaborativePlatformMain/MainWindow.xaml.cs
  20. BIN
      CollaborativePlatformMain/SystemLibrary/Other/HandyControl.dll
  21. BIN
      CollaborativePlatformMain/SystemLibrary/Other/LayUI.Wpf.dll
  22. 48 0
      CollaborativePlatformMain/packages.config

+ 40 - 0
CollaborativePlatformMain/CADStartUtil/FloorDataConfigUtil.cs

@@ -131,4 +131,44 @@ namespace CollaborativePlatformMain.CADStartUtil
         }
     }
 
+
+    /// <summary>
+    /// 
+    /// <para>文件名(File Name):     WholePictureDataConfigUtil.cs</para>
+    /// 
+    /// <para>描述(Description):     整图地址Config</para>
+    /// 
+    /// <para>数据表(Tables):        nothing</para>
+    /// 
+    /// <para>作者(Author):          Ou Rui Song</para>
+    /// 
+    /// <para>日期(Create Date):     2024年5月8日11:10:37</para>
+    /// 
+    /// 修改记录(Revision History):
+    ///     R1:
+    ///         修改作者:
+    ///         修改日期:
+    ///         修改理由:
+    /// 
+    /// </summary>
+    [Serializable]
+    public class WholePictureDataConfigUtil : XmlConfigBase
+    {
+        public override object InitConfig()
+        {
+            return new ObservableCollection<WholePictureData>();
+        }
+
+        public override void SetConfigFile()
+        {
+            ConfigFile = "WholePicture.config";
+        }
+
+        ObservableCollection<WholePictureData> info;
+        public ObservableCollection<WholePictureData> Info
+        {
+            get { return info == null ? info = new ObservableCollection<WholePictureData>() : info; }
+            set { info = value; }
+        }
+    }
 }

+ 44 - 0
CollaborativePlatformMain/CADStartUtil/OpenDrawPathData.cs

@@ -90,4 +90,48 @@ namespace CollaborativePlatformMain.CADStartUtil
         public bool IsOpen { get; set; }
 
     }
+
+
+    /// <summary>
+    /// 
+    /// <para>文件名(File Name):     WholePictureData.cs</para>
+    /// 
+    /// <para>描述(Description):     整图地址</para>
+    /// 
+    /// <para>数据表(Tables):        nothing</para>
+    /// 
+    /// <para>作者(Author):          Ou Rui Song</para>
+    /// 
+    /// <para>日期(Create Date):     2024年5月10日09:56:41</para>
+    /// 
+    /// 修改记录(Revision History):
+    ///     R1:
+    ///         修改作者:
+    ///         修改日期:
+    ///         修改理由:
+    /// 
+    /// </summary>
+    [Serializable]
+    public class WholePictureData
+    {
+        public WholePictureData()
+        {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="path"></param>
+        public WholePictureData(string path)
+        {
+            Path = path;
+        }
+
+
+        /// <summary>
+        /// 整图地址
+        /// </summary>
+        public string Path { get; set; }
+    }
 }

+ 8 - 4
CollaborativePlatformMain/CADStartUtil/StartCADUtil.cs

@@ -1,4 +1,5 @@
-using System;
+using DFBIM.CADNETCommon.XmlConfig;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
@@ -60,16 +61,18 @@ namespace CollaborativePlatformMain.CADStartUtil
                 var pros = Process.GetProcessesByName("acad");
                 if (pros.Length != 0)
                 {
+                    string dPath = Global.GetDriveLetterExceptC();
+
                     //已打开cad,写入一个文件,让cad监听文件
                     if (isFloor)
                     {
                         TwoOpenCADConfigUtil twoOpenCADConfigUtil = new TwoOpenCADConfigUtil();
-                        twoOpenCADConfigUtil.Save(new TwoOpenData(true), @"D:\DFBIM\CMTwoOpenFloor.config");
+                        twoOpenCADConfigUtil.Save(new TwoOpenData(true), string.Format(@"{0}\DFBIM\CMTwoOpenFloor.config", dPath));
                     }
                     else
                     {
                         OpenDrawConfigUtil openDrawConfigUtil = new OpenDrawConfigUtil();
-                        openDrawConfigUtil.Save(openDrawPathData, @"D:\DFBIM\OpenDrawPathData.config");
+                        openDrawConfigUtil.Save(openDrawPathData, string.Format(@"{0}\DFBIM\OpenDrawPathData.config", dPath));
                     }
                 }
                 else
@@ -81,8 +84,9 @@ namespace CollaborativePlatformMain.CADStartUtil
                     if (isFloor) File.WriteAllText(scriptFile, "CMOPENCADFLOOR\n");
                     else
                     {
+                        string dPath = Global.GetDriveLetterExceptC();
                         OpenDrawConfigUtil openDrawConfigUtil = new OpenDrawConfigUtil();
-                        openDrawConfigUtil.Save(openDrawPathData, @"D:\DFBIM\OpenDrawPathData.config");
+                        openDrawConfigUtil.Save(openDrawPathData, string.Format(@"{0}\DFBIM\OpenDrawPathData.config", dPath));
                         File.WriteAllText(scriptFile, "CMOPENCADDRAW\n");
                     }
                     // 启动AutoCAD进程并运行脚本文件

+ 168 - 6
CollaborativePlatformMain/CollaborativePlatformMain.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,6 +30,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -90,25 +93,159 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>SystemLibrary\CAD\CADNETCommon2019.dll</HintPath>
     </Reference>
+    <Reference Include="Costura, Version=5.8.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.5.8.0-alpha0098\lib\netstandard1.0\Costura.dll</HintPath>
+    </Reference>
     <Reference Include="HandyControl, Version=3.5.1.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.3.5.1\lib\net48\HandyControl.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>SystemLibrary\Other\HandyControl.dll</HintPath>
     </Reference>
     <Reference Include="LayUI.Wpf, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LayUI.Wpf.1.0.2.240407\lib\net48\LayUI.Wpf.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>SystemLibrary\Other\LayUI.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System">
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data">
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Drawing" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Drawing.Common.8.0.3\lib\net462\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>SystemLibrary\Other\System.Windows.Forms.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml">
       <Private>True</Private>
@@ -125,13 +262,15 @@
     <Reference Include="System.Data.DataSetExtensions">
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http">
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="WindowsBase">
       <Private>True</Private>
     </Reference>
@@ -195,6 +334,9 @@
     <Compile Include="Form\MessageSubPage\Project\TempPage.xaml.cs">
       <DependentUpon>TempPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Form\MessageSubPage\SeconArticleReviewPage.xaml.cs">
+      <DependentUpon>SeconArticleReviewPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Form\MessageSubPage\SeconContactsPage.xaml.cs">
       <DependentUpon>SeconContactsPage.xaml</DependentUpon>
     </Compile>
@@ -276,6 +418,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Form\MessageSubPage\SeconArticleReviewPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Form\MessageSubPage\SeconContactsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -431,9 +577,25 @@
     <Content Include="SystemLibrary\CAD\CADNETCommon2019.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="SystemLibrary\Other\HandyControl.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="SystemLibrary\Other\LayUI.Wpf.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="SystemLibrary\Other\System.Windows.Forms.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.6.6.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.0\build\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.6.6.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets'))" />
+  </Target>
+  <Import Project="..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.8.0-alpha0098\build\Costura.Fody.targets')" />
 </Project>

+ 14 - 6
CollaborativePlatformMain/Form/HomepageForm.xaml

@@ -9,12 +9,12 @@
         AllowsTransparency="True"
         Background=" Transparent"
         WindowStartupLocation="CenterScreen"
-        WindowStyle="None"
+        WindowStyle="None" 
         Title="" Height="557" Width="800" ResizeMode="NoResize">
-    <LayUI:LayTitleBar Background="{DynamicResource Blue}"   CornerRadius="10"
-                       WindowState="{Binding WindowState, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+
+    <LayUI:LayTitleBar Background="{DynamicResource Blue}"   CornerRadius="10">
         <LayUI:LayTitleBar.Header>
-            <Border Height="35">
+            <Border Height="35" >
                 <DockPanel>
                     <TextBlock Margin="10,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
                                Text="协同平台" />
@@ -54,8 +54,11 @@
                             <MenuItem Name="mitem_tool" Width="118" Height="40" Header="工具库    "
                                       PreviewMouseLeftButtonDown="tool_Click"/>
 
-                            <MenuItem Width="118" Height="40" Header="三维    "
-                                      PreviewMouseLeftButtonDown="three_Click"/>
+                            <!--<MenuItem Width="118" Height="40" Header="三维    "
+                                      PreviewMouseLeftButtonDown="three_Click"/>-->
+
+                            <MenuItem Width="118" Height="40" Header="条文审查" 
+                                      PreviewMouseLeftButtonDown="MenuItem_PreviewMouseLeftButtonDown"/>
                         </Menu>
                     </StackPanel>
 
@@ -94,6 +97,11 @@
                         <Frame Name="seconThreeTools" NavigationUIVisibility="Hidden"/>
                     </DockPanel>
 
+                    <!--条文审查-->
+                    <DockPanel Name="dp_ArticleReview" Visibility="Collapsed">
+                        <Frame Name="seconArticleReview" NavigationUIVisibility="Hidden"/>
+                    </DockPanel>
+
 
                 </DockPanel>
 

+ 35 - 742
CollaborativePlatformMain/Form/HomepageForm.xaml.cs

@@ -65,6 +65,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Collapsed;
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
 
             SeconMessagePage = new SeconMessagePage(this);
             seconMessagePage.Navigate(SeconMessagePage);
@@ -94,6 +95,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Collapsed;
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
 
             if (!IsSeconProjectPageShow)
             {
@@ -122,6 +124,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Visible;
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
 
             if (!IsSeconContactsPage)
             {
@@ -151,6 +154,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Visible;
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
 
             if (!IsSeconLegendPage)
             {
@@ -179,6 +183,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Collapsed;
             dp_tools.Visibility = Visibility.Visible;
             dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
 
             if (!IsSeconToolLibraryPage)
             {
@@ -207,6 +212,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Collapsed;
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Visible;
+            dp_ArticleReview.Visibility = Visibility.Collapsed;
             if (!IsSeconThreeDimensionalPage)
             {
                 seconThreeTools.Navigate(new SeconThreeDimensionalPage(this));
@@ -215,6 +221,33 @@ namespace CollaborativePlatformMain.Form
 
         }
 
+        /// <summary>
+        /// 条文审查是否初始化
+        /// </summary>
+        public bool IsSeconArticleReviewPage = false;
+
+        /// <summary>
+        /// 条文审查
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MenuItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            MenuItem menuItem = sender as MenuItem;
+            ModifyBackground(menuItem);
+            dp_message.Visibility = Visibility.Collapsed;
+            dp_project.Visibility = Visibility.Collapsed;
+            dp_contacts.Visibility = Visibility.Collapsed;
+            dp_gallery.Visibility = Visibility.Collapsed;
+            dp_tools.Visibility = Visibility.Collapsed;
+            dp_threetools.Visibility = Visibility.Collapsed;
+            dp_ArticleReview.Visibility = Visibility.Visible;
+            if (!IsSeconArticleReviewPage)
+            {
+                seconArticleReview.Navigate(new SeconArticleReviewPage());
+                IsSeconArticleReviewPage = true;
+            }
+        }
 
         /// <summary>
         /// 设置最左测导航的颜色
@@ -239,748 +272,6 @@ namespace CollaborativePlatformMain.Form
 
         #endregion
 
-        #region 工具中间按钮
-
-        private ObservableCollection<CBButtonControlsData> ToolLists = new ObservableCollection<CBButtonControlsData>();
-
-        /// <summary>
-        /// 功能名字对应的功能数据
-        /// </summary>
-        private Dictionary<string, ObservableCollection<CBButtonControlsData>> ToolName_ToolDatas = new Dictionary<string, ObservableCollection<CBButtonControlsData>>()
-        {
-            {
-                "平台图纸治理",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("功能1",false,""),
-                    new CBButtonControlsData("功能2",false,""),
-                    new CBButtonControlsData("功能3",false,""),
-                    new CBButtonControlsData("功能4",false,""),
-                    new CBButtonControlsData("功能5",false,""),
-                    new CBButtonControlsData("功能6",false,""),
-                    new CBButtonControlsData("功能7",false,""),
-                    new CBButtonControlsData("功能8",false,""),
-                }
-            },
-            {
-                "块处理",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("处理1",false,""),
-                    new CBButtonControlsData("处理2",false,""),
-                    new CBButtonControlsData("处理3",false,""),
-                    new CBButtonControlsData("处理4",false,""),
-                    new CBButtonControlsData("处理5",false,""),
-                    new CBButtonControlsData("处理6",false,""),
-                    new CBButtonControlsData("处理7",false,""),
-                    new CBButtonControlsData("处理8",false,""),
-                }
-            },
-            {
-                "大样处理",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("大样1",false,""),
-                    new CBButtonControlsData("大样2",false,""),
-                    new CBButtonControlsData("大样3",false,""),
-                    new CBButtonControlsData("大样4",false,""),
-                    new CBButtonControlsData("大样5",false,""),
-                    new CBButtonControlsData("大样6",false,""),
-                    new CBButtonControlsData("大样7",false,""),
-                    new CBButtonControlsData("大样8",false,""),
-                }
-            },
-            {
-                "图纸对比",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("图纸对比",false,"")
-                }
-            },
-            {
-                "二维审查",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("二维审查",false,"")
-                }
-            }, {
-                "三维",new ObservableCollection<CBButtonControlsData>()
-                {
-                    new CBButtonControlsData("三维",false,"")
-                }
-            },
-        };
-
-        private void toolnavigation_Click(object sender, RoutedEventArgs e)
-        {
-            //Button button = sender as Button;
-
-            //if (button != null && ToolName_ToolDatas.ContainsKey(button.Content.ToString()))
-            //{
-            //    ObservableCollection<CBButtonControlsData> cbButtonControls = ToolName_ToolDatas[button.Content.ToString()];
-
-            //    wp_tools.Children.Clear();
-
-            //    foreach (var cbButtonControl in cbButtonControls)
-            //    {
-            //        wp_tools.Children.Add(new CBButtonControls(cbButtonControl));
-            //    }
-            //}
-        }
-
-        /// <summary>
-        /// 添加漂浮工具
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void bt_addTools(object sender, RoutedEventArgs e)
-        {
-            foreach (var tool in ToolName_ToolDatas)
-            {
-                foreach (var value in tool.Value)
-                {
-                    if (!value.CbIsCheck)
-                    {
-                        if (ToolLists.Where(x => x.Guid.Equals(value.Guid)).Count() > 0)
-                        {
-                            for (int i = 0; i < ToolLists.Count; i++)
-                            {
-                                if (ToolLists[i].Guid.Equals(value.Guid))
-                                {
-                                    ToolLists.RemoveAt(i);
-                                    i--;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (ToolLists.Where(x => x.Guid.Equals(value.Guid)).Count() > 0) continue;
-                        ToolLists.Add(value);
-                    }
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// 悬浮窗
-        /// </summary>
-        private ObservableCollection<LVProjectInfoEntity> ToolDatas = new ObservableCollection<LVProjectInfoEntity>()
-        {
-            new LVProjectInfoEntity("图纸对比", ""),
-            new LVProjectInfoEntity("超模全解析", ""),
-            new LVProjectInfoEntity("超模数字化建模", "")
-        };
-
-        #endregion
-
-        #region 中间的按钮
-
-        private void General_Click(object sender, MouseButtonEventArgs e)
-        {
-        }
-
-        #endregion
-
-        #region 横向通知消息栏
-
-        private List<Button> menuItems = new List<Button>();
-
-        /// <summary>
-        /// 通知公告数据
-        /// </summary>
-        private List<NotificationAnnouncement> notificationDatas = new List<NotificationAnnouncement>();
-
-        /// <summary>
-        /// 通知公告
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void me_announcementClick(object sender, RoutedEventArgs e)
-        {
-            //notificationDatas = new List<NotificationAnnouncement>();
-
-            //for (int i = 0; i < new List<string>() { "国博城项目建筑图纸更新", "北京大兴项目结构图纸更新", "绿地项目人防图纸更新" }.Count; i++)
-            //{
-            //    NotificationAnnouncement notificationAnnouncement = new NotificationAnnouncement();
-            //    notificationAnnouncement.MessageCategory = "通知公告";
-
-            //    if (i == 0)
-            //    {
-            //        notificationAnnouncement.Content = "国博城项目总消息";
-            //        notificationAnnouncement.SpecificContent = "按甲方要求,国博城项目务必在4月15号之前完成报审版。";
-            //    }
-            //    else if (i == 1)
-            //    {
-            //        notificationAnnouncement.Content = "北京大兴项目总消息";
-            //        notificationAnnouncement.SpecificContent = "按甲方要求,北京大兴项目务必在4月22号之前完成报审版。";
-            //    }
-            //    else if (i == 2)
-            //    {
-            //        notificationAnnouncement.Content = "绿地项目总消息";
-            //        notificationAnnouncement.SpecificContent = "按甲方要求,绿地项目务必在4月30号之前完成报审版。";
-            //    }
-
-            //    notificationDatas.Add(notificationAnnouncement);
-            //}
-
-            //me_message.Children.Clear();
-            //foreach (var notificationData in notificationDatas)
-            //{
-            //    Button button = new Button();
-            //    button.Content = notificationData.Content;
-            //    button.BorderThickness = new Thickness(0);
-            //    button.Width = 180;
-            //    button.Height = 30;
-            //    button.Click += new RoutedEventHandler(messageBtnClick);
-            //    button.Tag = notificationData;
-            //    button.HorizontalContentAlignment = HorizontalAlignment.Left;
-            //    me_message.Children.Add(button);
-            //}
-        }
-
-        /// <summary>
-        /// 项目
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void me_projectClick(object sender, RoutedEventArgs e)
-        {
-            //notificationDatas = new List<NotificationAnnouncement>();
-            //foreach (var xiangmu in new List<string>() { "国博城项目建筑图纸更新", "北京大兴项目结构图纸更新", "绿地项目人防图纸更新" })
-            //{
-            //    NotificationAnnouncement notificationAnnouncement = new NotificationAnnouncement();
-            //    notificationAnnouncement.Content = xiangmu;
-            //    notificationAnnouncement.MessageCategory = "项目消息";
-
-            //    if (xiangmu.Equals("国博城项目建筑图纸更新"))
-            //    {
-            //        notificationAnnouncement.SpecificContent = "国博城项目建筑1#楼3层更新。";
-            //    }
-            //    else if (xiangmu.Equals("北京大兴项目结构图纸更新"))
-            //    {
-            //        notificationAnnouncement.SpecificContent = "北京大兴项目结构2#楼1层墙柱平法图更新。";
-            //    }
-            //    else if (xiangmu.Equals("绿地项目人防图纸更新"))
-            //    {
-            //        notificationAnnouncement.SpecificContent = "绿地项目地下人防图更新。";
-            //    }
-
-            //    notificationDatas.Add(notificationAnnouncement);
-            //}
-
-            //me_message.Children.Clear();
-            //foreach (var notificationData in notificationDatas)
-            //{
-            //    Button button = new Button();
-            //    button.Content = notificationData.Content;
-            //    button.BorderThickness = new Thickness(0);
-            //    button.Width = 180;
-            //    button.Height = 30;
-            //    button.Click += new RoutedEventHandler(messageBtnClick);
-            //    button.Tag = notificationData;
-            //    button.HorizontalContentAlignment = HorizontalAlignment.Left;
-            //    me_message.Children.Add(button);
-            //}
-        }
-
-        /// <summary>
-        /// 系统
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void me_systemClick(object sender, RoutedEventArgs e)
-        {
-            //    NotificationAnnouncement notificationAnnouncement = new NotificationAnnouncement();
-            //    notificationAnnouncement.Content = "系统更新";
-            //    notificationAnnouncement.SpecificContent = "交互平台版本更新至2.0版本·  本次更新了:·    1.主界面消息分组。·    2.修改了登陆界面。·   请及时更新!!";
-            //    notificationAnnouncement.MessageCategory = "系统消息";
-            //    NotificationAnnouncement notificationAnnouncement2 = new NotificationAnnouncement();
-            //    notificationAnnouncement2.Content = "停服升级";
-            //    notificationAnnouncement2.SpecificContent = "交互平台版本将在4月13日8点20分至4月13日8点50分进行停服更新·本次停服更新不会导致您的数据丢失。";
-            //    notificationAnnouncement2.MessageCategory = "系统消息";
-            //    notificationDatas = new List<NotificationAnnouncement>()
-            //    {
-            //        notificationAnnouncement,
-            //        notificationAnnouncement2
-            //};
-
-            //    me_message.Children.Clear();
-            //    foreach (var notificationData in notificationDatas)
-            //    {
-            //        Button button = new Button();
-            //        button.Content = notificationData.Content;
-            //        button.BorderThickness = new Thickness(0);
-            //        button.Width = 180;
-            //        button.Height = 30;
-            //        button.Click += new RoutedEventHandler(messageBtnClick);
-            //        button.Tag = notificationData;
-            //        button.HorizontalContentAlignment = HorizontalAlignment.Left;
-            //        me_message.Children.Add(button);
-            //    }
-        }
-
-        /// <summary>
-        /// 具体消息按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void messageBtnClick(object sender, RoutedEventArgs e)
-        {
-            //me_right.Children.Clear();
-            //Button button = sender as Button;
-
-            //NotificationAnnouncement announcement = button.Tag as NotificationAnnouncement;
-
-            //List<string> specificContent = announcement.SpecificContent.Split('·').ToList();
-
-            //foreach (var specificConten in specificContent)
-            //{
-            //    TextBlock textBlock = new TextBlock();
-            //    textBlock.Text = specificConten;
-            //    textBlock.FontSize = 15;
-            //    textBlock.FontFamily = new FontFamily("黑体");
-            //    me_right.Children.Add(textBlock);
-            //}
-
-            //if (announcement.MessageCategory.Equals("项目消息"))
-            //{
-            //    DockPanel dockPanel = new DockPanel();
-            //    dockPanel.Margin = new Thickness(0, 10, 30, 0);
-            //    dockPanel.HorizontalAlignment = HorizontalAlignment.Right;
-
-            //    TextBlock textBlock = new TextBlock();
-            //    textBlock.Text = "查看";
-            //    textBlock.FontSize = 13;
-            //    textBlock.Foreground = new SolidColorBrush(Colors.Green);
-            //    textBlock.TextDecorations = TextDecorations.Underline;
-            //    textBlock.Margin = new Thickness(0, 0, 10, 0);
-            //    textBlock.FontFamily = new FontFamily("黑体");
-            //    textBlock.PreviewMouseLeftButtonDown += new MouseButtonEventHandler(Message_Look);
-
-            //    dockPanel.Children.Add(textBlock);
-
-            //    TextBlock textBlock2 = new TextBlock();
-            //    textBlock2.Text = "忽略";
-            //    textBlock2.FontSize = 13;
-            //    textBlock2.FontFamily = new FontFamily("黑体");
-            //    textBlock2.Foreground = new SolidColorBrush(Colors.Green);
-            //    textBlock2.TextDecorations = TextDecorations.Underline;
-            //    textBlock2.PreviewMouseLeftButtonDown += new MouseButtonEventHandler(Message_Ignore);
-
-            //    dockPanel.Children.Add(textBlock2);
-            //    me_right.Children.Add(dockPanel);
-            //}
-        }
-
-        /// <summary>
-        /// 查看消息
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void Message_Look(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("查看消息");
-        }
-
-        /// <summary>
-        /// 忽略消息
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void Message_Ignore(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("忽略消息");
-        }
-
-        #endregion
-
-        #region 项目中间部分
-
-        ///// <summary>
-        ///// 项目信息示例
-        ///// </summary>
-        //private ObservableCollection<LVProjectInfoEntity> lvProjects = new ObservableCollection<LVProjectInfoEntity>()
-        //{
-        //    new LVProjectInfoEntity("项目名称:", "北京大兴项目"),
-        //    new LVProjectInfoEntity("项目业态:", "住宅"),
-        //    new LVProjectInfoEntity("项目地址:", "山东省济南市"),
-        //    new LVProjectInfoEntity("项目团队:", "项目团队")
-        //};
-
-        ///// <summary>
-        ///// 项目信息示例
-        ///// </summary>
-        //private ObservableCollection<LVTeamMembersEntity> lvTeamMemberss = new ObservableCollection<LVTeamMembersEntity>()
-        //{
-        //    new LVTeamMembersEntity("主管:", "李明"),
-        //    new LVTeamMembersEntity("建筑组员:", "李明"),
-        //    new LVTeamMembersEntity("结构组员:", "张修"),
-        //    new LVTeamMembersEntity("给排水组员:", "邢华"),
-        //    new LVTeamMembersEntity("暖通组员:", "杨程"),
-        //    new LVTeamMembersEntity("电气组员:", "欧瑞"),
-        //};
-
-        ///// <summary>
-        ///// 项目TreeView
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void tv_projectLeftButtonUp(object sender, MouseButtonEventArgs e)
-        //{
-        //    #region 隐藏所有的无用控件
-
-        //    lv_projectInfo.Visibility = Visibility.Collapsed;
-        //    sp_info.Visibility = Visibility.Collapsed;
-        //    sp_work.Visibility = Visibility.Collapsed;
-        //    sp_addPro.Visibility = Visibility.Collapsed;
-
-        //    #endregion
-
-        //    TreeViewBind treeView = tr_vw.SelectedItem as TreeViewBind;
-        //    if (treeView == null) return;
-
-        //    string name = treeView.Name;
-
-        //    if (name.Equals("项目信息"))
-        //    {
-        //        sp_info.Visibility = Visibility.Visible;
-        //        lv_projectInfo.Visibility = Visibility.Visible;
-        //        lv_projectInfo.ItemsSource = null;
-        //        lv_projectInfo.ItemsSource = lvProjects;
-        //    }
-        //    else if (name.Equals("团队成员"))
-        //    {
-        //        sp_info.Visibility = Visibility.Visible;
-        //        lv_projectInfo.Visibility = Visibility.Visible;
-        //        lv_projectInfo.ItemsSource = null;
-        //        lv_projectInfo.ItemsSource = lvTeamMemberss;
-        //    }
-        //    else if (name.Equals("工作台"))
-        //    {
-        //        sp_work.Visibility = Visibility.Visible;
-        //        tr_is.ItemsSource = null;
-        //        if (!treeView.IsPro)
-        //        {
-        //            List<TreeViewBind> TreeViewDatas = new List<TreeViewBind>();
-
-        //            TreeViewDatas.Add(new TreeViewBind("小学项目", new List<TreeViewBind>() { new TreeViewBind("新建图纸") }));
-
-        //            this.tr_is.ItemsSource = TreeViewDatas;
-        //        }
-        //        else
-        //        {
-        //            this.tr_is.ItemsSource = TreeViewDatas;
-        //        }
-        //    }
-        //    else if (name.Equals("自定义"))
-        //    {
-        //    }
-        //}
-
-        ///// <summary>
-        ///// lv内修改按钮
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void btn_lv_update(object sender, RoutedEventArgs e)
-        //{
-        //    Button button = sender as Button;
-        //    LVProjectInfoEntity lvProjectInfo = button.Tag as LVProjectInfoEntity;
-        //    if (lvProjectInfo != null)
-        //    {
-        //    }
-        //}
-
-        ///// <summary>
-        ///// 上传图纸
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void Button_Click(object sender, RoutedEventArgs e)
-        //{
-        //    TreeViewBind treeViewBind = TreeViewDatas.First(s => s.Name.Equals("小学项目 一号楼"));
-        //    UploadDrawingForm upWindow = new UploadDrawingForm(TreeViewDatas);
-
-        //    foreach (var item in treeViewBind.Children)
-        //    {
-        //        if (item.Name.Equals("上传新图")) continue;
-        //        upWindow.str.Add(item.Name);
-        //    }
-
-        //    upWindow.ShowDialog();
-
-        //    this.tr_is.ItemsSource = null;
-        //    this.tr_is.ItemsSource = TreeViewDatas;
-        //}
-
-        //#region 工作台
-
-        ///// <summary>
-        /////  工作台数据绑定
-        ///// </summary>
-        //public static ObservableCollection<TreeViewBind> TreeViewDatas = new ObservableCollection<TreeViewBind>()
-        //{
-        //    new TreeViewBind("小学项目 一号楼",
-        //        new List<TreeViewBind>()
-        //        {
-        //            new TreeViewBind("上传图纸")
-        //        })
-        //};
-
-        ///// <summary>
-        ///// 版本名称
-        ///// </summary>
-        //private List<string> ProVersions = new List<string>();
-
-        ///// <summary>
-        ///// 本专业
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void pre_Click(object sender, MouseButtonEventArgs e)
-        //{
-        //    tr_all.Visibility = Visibility.Collapsed;
-        //    tr_is.Visibility = Visibility.Visible;
-        //    bt_proBig.Visibility = Visibility.Collapsed;
-        //}
-
-        ///// <summary>
-        ///// 全专业
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void all_Click(object sender, MouseButtonEventArgs e)
-        //{
-        //    tr_is.Visibility = Visibility.Collapsed;
-        //    tr_all.Visibility = Visibility.Visible;
-        //    tv_building.ItemsSource = null;
-        //    tv_building.ItemsSource = TreeViewDatas;
-        //    bt_proBig.Visibility = Visibility.Visible;
-        //}
-
-        ///// <summary>
-        ///// treeview点击
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void tr_is_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        //{
-        //    TreeViewBind treeView = tr_is.SelectedItem as TreeViewBind;
-
-        //    //切换展开和下拉
-        //    if (treeView == null)
-        //    {
-        //        return;
-        //    }
-        //    if (tr_is.ItemContainerGenerator.ContainerFromItem(treeView) is TreeViewItem currentItem)
-        //    {
-        //        if (!currentItem.IsExpanded)
-        //        {
-        //            currentItem.IsExpanded = true;
-        //        }
-        //        else
-        //        {
-        //            currentItem.IsExpanded = false;
-        //        }
-        //    }
-
-        //    if (treeView.Name.Contains("更新图纸"))
-        //    {
-        //        TreeViewBind treeViewBind = TreeViewDatas.First(s => s.Name.Equals("小学项目 一号楼"));
-        //        UploadDrawingForm upWindow = new UploadDrawingForm(TreeViewDatas);
-
-        //        foreach (var item in treeViewBind.Children)
-        //        {
-        //            if (item.Name.Equals("治理图纸")) break;
-        //            upWindow.str.Add(item.Name);
-        //        }
-        //        upWindow.ShowDialog();
-        //        string t7 = DateTime.Now.ToShortTimeString();
-        //        string t3 = DateTime.Now.ToLongDateString() + t7;
-
-        //        string proVersion = "";
-
-        //        if (ProVersions.Contains(t3 + "版本"))
-        //        {
-        //            int proVersionIndex = 0;
-
-        //            for (int i = 0; i < 100; i++)
-        //            {
-        //                int j = i + 1;
-
-        //                if (ProVersions.Contains(t3 + "(" + j + ")" + "版本"))
-        //                {
-        //                    continue;
-        //                }
-        //                else
-        //                {
-        //                    proVersionIndex = i + 1;
-        //                    break;
-        //                }
-        //            }
-
-        //            proVersion = t3 + "(" + proVersionIndex + ")" + "版本";
-        //        }
-        //        else
-        //        {
-        //            proVersion = t3 + "版本";
-        //        }
-
-        //        ProVersions.Add(proVersion);
-        //        TreeViewBind TreeViewBind1 = new TreeViewBind(proVersion, new List<TreeViewBind>()
-        //            {
-        //                new TreeViewBind("原图"),
-        //                new TreeViewBind("对比图"),
-        //                new TreeViewBind("治理图纸", new List<TreeViewBind>()
-        //                {
-        //                    new TreeViewBind("F1"),
-        //                    new TreeViewBind("F2",
-        //                        new List<TreeViewBind>()
-        //                        {
-        //                            new TreeViewBind("墙柱"),
-        //                            new TreeViewBind("门窗"),
-        //                            new TreeViewBind("功能区标签"),
-        //                            new TreeViewBind("未命名")
-        //                        })
-        //                })
-        //            });
-
-        //        int index = CollaborationUtil.GetIndexByTreeView("更新图纸", TreeViewDatas.FirstOrDefault().Children);
-        //        TreeViewDatas.FirstOrDefault().Children.Insert(index, TreeViewBind1);
-
-        //        this.tr_is.ItemsSource = null;
-        //        this.tr_is.ItemsSource = TreeViewDatas;
-        //    }
-        //    else if (treeView.Name.Contains("上传图纸"))
-        //    {
-        //        string t7 = DateTime.Now.ToShortTimeString();
-        //        string t3 = DateTime.Now.ToLongDateString() + t7;
-
-        //        ProVersions.Add(t3 + "版本");
-        //        TreeViewBind TreeViewBind1 = new TreeViewBind(t3 + "版本", new List<TreeViewBind>()
-        //        {
-        //            new TreeViewBind("原图"),
-        //            new TreeViewBind("治理图纸", new List<TreeViewBind>()
-        //            {
-        //                new TreeViewBind("F1"),
-        //                new TreeViewBind("F2",
-        //                    new List<TreeViewBind>()
-        //                    {
-        //                        new TreeViewBind("墙柱"),
-        //                        new TreeViewBind("门窗"),
-        //                        new TreeViewBind("功能区标签"),
-        //                        new TreeViewBind("未命名")
-        //                    })
-        //            })
-        //        });
-        //        TreeViewDatas.FirstOrDefault().Children.Insert(0, TreeViewBind1);
-        //        TreeViewDatas.FirstOrDefault().Children.Add(new TreeViewBind("更新图纸"));
-
-        //        for (int i = 0; i < TreeViewDatas.FirstOrDefault().Children.Count; i++)
-        //        {
-        //            if (TreeViewDatas.FirstOrDefault().Children[i].Name.Equals("上传图纸"))
-        //            {
-        //                TreeViewDatas.FirstOrDefault().Children.RemoveAt(i);
-        //                i--;
-        //                break;
-        //            }
-        //        }
-
-        //        tr_is.ItemsSource = null;
-        //        tr_is.ItemsSource = TreeViewDatas;
-        //    }
-        //}
-
-        ///// <summary>
-        ///// 放大
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void bt_proBigClick(object sender, RoutedEventArgs e)
-        //{
-        //    ProjectForm projectForm = new ProjectForm(this, TreeViewDatas);
-
-        //    this.Hide();
-        //    projectForm.ShowDialog();
-        //    this.Show();
-        //}
-
-        //#endregion
-
-        //#region 新增项目
-
-        //private void bt_addPro(object sender, RoutedEventArgs e)
-        //{
-        //    #region 隐藏所有的无用控件
-
-        //    lv_projectInfo.Visibility = Visibility.Collapsed;
-        //    sp_info.Visibility = Visibility.Collapsed;
-        //    sp_work.Visibility = Visibility.Collapsed;
-
-        //    #endregion
-
-        //    sp_addPro.Visibility = Visibility.Visible;
-        //}
-
-        //private void close_Click(object sender, RoutedEventArgs e)
-        //{
-        //    gd_top.Visibility = Visibility.Collapsed;
-        //}
-
-        //private void bd_Initialized(object sender, EventArgs e)
-        //{
-        //}
-
-        //private void st_Initialized(object sender, EventArgs e)
-        //{
-        //}
-
-        //private void wt_Initialized(object sender, EventArgs e)
-        //{
-        //}
-
-        //private void wm_Initialized(object sender, EventArgs e)
-        //{
-        //}
-
-        //private void ele_Initialized(object sender, EventArgs e)
-        //{
-        //}
-
-        //private void submit_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void saveFile_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void savePage_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void ele_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void wm_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void wt_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void st_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-        //private void bd_Click(object sender, RoutedEventArgs e)
-        //{
-        //}
-
-
-        //#endregion
-
-        #endregion
-
         /// <summary>
         /// 青蓝小助手
         /// </summary>
@@ -993,5 +284,7 @@ namespace CollaborativePlatformMain.Form
             StandardizedAssistantForm assistantForm = new StandardizedAssistantForm(this);
             assistantForm.Show();
         }
+
+       
     }
 }

+ 2 - 1
CollaborativePlatformMain/Form/MessageSubPage/FullProfessionPage.xaml

@@ -33,7 +33,8 @@
                         <CheckBox Name="cb_Check" Visibility="{Binding IsShow ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                   IsChecked="{Binding IsCheck,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                         <Label Content="{Binding Node,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                               Background="Transparent" BorderThickness="0"  HorizontalAlignment="Left" />
+                               Background="Transparent" BorderThickness="0"  HorizontalAlignment="Left"
+                               PreviewMouseLeftButtonDown="Label_PreviewMouseLeftButtonDown"/>
                     </DockPanel>
                 </HierarchicalDataTemplate>
             </TreeView.ItemTemplate>

+ 21 - 1
CollaborativePlatformMain/Form/MessageSubPage/FullProfessionPage.xaml.cs

@@ -1,4 +1,5 @@
-using CollaborativePlatformMain.DFEntity.MessageSubUtil;
+using CollaborativePlatformMain.CADStartUtil;
+using CollaborativePlatformMain.DFEntity.MessageSubUtil;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -189,5 +190,24 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
         private void cb_Check_Checked(object sender, RoutedEventArgs e)
         {
         }
+
+        /// <summary>
+        /// 鼠标点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Label_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            Label label = sender as Label;
+            if (label == null) return;
+            OperatEntity operatEntity = label.DataContext as OperatEntity;
+            if (operatEntity == null) return;
+            if (operatEntity.DrawPath != null && operatEntity.DrawPath != "")
+            {
+                OpenDrawPathData openDrawPathData = new OpenDrawPathData(true, operatEntity.DrawPath);
+
+                StartCADUtil.StartCADMath(false, openDrawPathData);
+            }
+        }
     }
 }

+ 3 - 3
CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CollaborativePlatformMain.Form.MessageSubPage.Project"
         mc:Ignorable="d" Width="483" Height="430"
-        Title="NewProjrctPage" >
+        Title="NewProjrctPage" Loaded="Page_Loaded">
 
 
     <StackPanel Name="sp_addPro"  Width="483" Margin="10, 10 ,0, 0">
@@ -24,13 +24,13 @@
         <!--项目地址-->
         <DockPanel Margin="0 10 0 0">
             <Label Width="80" FontSize="13" Margin="30 0 0 0" Content="项目业态:"  VerticalAlignment="Center"></Label>
-            <TextBox Name="tb_staus" Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" />
+            <ComboBox Name="cb_staus" Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" />
         </DockPanel>
 
         <!--项目地址-->
         <DockPanel Margin="0 10 0 0">
             <Label Width="80" FontSize="13" Margin="30 0 0 0" Content="项目地址:"  VerticalAlignment="Center"></Label>
-            <TextBox Name="tb_Path" Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" />
+            <ComboBox Name="cb_Path" Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" />
         </DockPanel>
 
 

+ 29 - 2
CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml.cs

@@ -35,6 +35,32 @@ namespace CollaborativePlatformMain.Form.MessageSubPage.Project
         }
 
         /// <summary>
+        /// 窗体初始化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+            //初始化业态数据
+            List<string> business = new List<string>() { "住宅", "公寓", "宿舍", "医疗", "商业", "学校", "其他" };
+            cb_staus.ItemsSource = business;
+            cb_staus.SelectedItem = business.FirstOrDefault();
+
+            //初始化项目地址
+            List<string> paths = new List<string>() { "山东","山西", "河北","河南", "江苏","浙江",
+                                                      "辽宁","吉林", "黑龙江","安徽", "福建","江西",
+                                                      "湖北","湖南", "广东","海南", "四川","贵州",
+                                                      "云南","陕西", "甘肃","青海", "台湾","内蒙古", "广西",
+                                                      "西藏", "宁夏","新疆","北京","天津","上海","重庆",
+                                                      "香港","澳门"};
+            cb_Path.ItemsSource = paths;
+            cb_Path.SelectedItem = paths.FirstOrDefault();
+
+
+        }
+
+
+        /// <summary>
         /// 青蓝小助手提示关闭事件
         /// </summary>
         /// <param name="sender"></param>
@@ -89,7 +115,7 @@ namespace CollaborativePlatformMain.Form.MessageSubPage.Project
             }
 
             //项目业态
-            string businessName = tb_staus.Text.ToString();
+            string businessName = cb_staus.SelectedItem.ToString();
             if (businessName == null || businessName == "")
             {
                 MessageBox.Show("请输入项目业态");
@@ -97,7 +123,7 @@ namespace CollaborativePlatformMain.Form.MessageSubPage.Project
             }
 
             //项目地址
-            string pathName = tb_Path.Text.ToString();
+            string pathName = cb_Path.SelectedItem.ToString();
             if (pathName == null || pathName == "")
             {
                 MessageBox.Show("请输入项目地址");
@@ -214,5 +240,6 @@ namespace CollaborativePlatformMain.Form.MessageSubPage.Project
             }
         }
 
+
     }
 }

+ 2 - 3
CollaborativePlatformMain/Form/MessageSubPage/Project/OperatingFloorPage.xaml

@@ -17,11 +17,10 @@
 
         <StackPanel Name="sp_Single" Visibility="Visible">
 
-            <TreeView x:Name="tr_threemodel" PreviewMouseLeftButtonUp="tr_threemodel_PreviewMouseLeftButtonUp"
-                                  Width="483" Height="370" HorizontalAlignment="Left" >
+            <TreeView x:Name="tr_threemodel"  Width="483" Height="370" HorizontalAlignment="Left" >
                 <TreeView.ItemTemplate>
                     <HierarchicalDataTemplate ItemsSource="{Binding SubDatas}">
-                        <Label Content="{Binding Node}"  BorderThickness="0" Background="Transparent"  HorizontalAlignment="Left"/>
+                        <Label Content="{Binding Node}"  BorderThickness="0" Background="Transparent" PreviewMouseLeftButtonDown="Label_PreviewMouseDoubleClick" HorizontalAlignment="Left"/>
                     </HierarchicalDataTemplate>
                 </TreeView.ItemTemplate>
             </TreeView>

+ 19 - 0
CollaborativePlatformMain/Form/MessageSubPage/Project/OperatingFloorPage.xaml.cs

@@ -244,5 +244,24 @@ namespace CollaborativePlatformMain.Form.MessageSubPage.Project
 
             HomepageForm.Hide();
         }
+
+        /// <summary>
+        /// 鼠标双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Label_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            Label label = sender as Label;
+            if (label == null) return;
+            OperatEntity operatEntity = label.DataContext as OperatEntity;
+            if (operatEntity == null) return;
+            if (operatEntity.DrawPath != null && operatEntity.DrawPath != "")
+            {
+                OpenDrawPathData openDrawPathData = new OpenDrawPathData(true, operatEntity.DrawPath);
+
+                StartCADUtil.StartCADMath(false, openDrawPathData);
+            }
+        }
     }
 }

+ 25 - 0
CollaborativePlatformMain/Form/MessageSubPage/SeconArticleReviewPage.xaml

@@ -0,0 +1,25 @@
+<Page x:Class="CollaborativePlatformMain.Form.MessageSubPage.SeconArticleReviewPage"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CollaborativePlatformMain.Form.MessageSubPage"
+        mc:Ignorable="d"
+        Title="SeconContactsPage" Width="663" Height="430"
+        Loaded="Page_Loaded">
+
+    <StackPanel Name="sp_contacts" Margin="10,20,0,0">
+
+        <DockPanel>
+
+            <Label Content="选择图纸:"/>
+            <TextBox Text="双击选择图纸" Width="200" Height="23" HorizontalAlignment="Left"/>
+
+        </DockPanel>
+
+        <DockPanel Margin="80,10,0,0">
+            <Button Width="80" Height="25" HorizontalAlignment="Left" Content="审查"/>
+        </DockPanel>
+
+    </StackPanel>
+</Page>

+ 37 - 0
CollaborativePlatformMain/Form/MessageSubPage/SeconArticleReviewPage.xaml.cs

@@ -0,0 +1,37 @@
+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.Shapes;
+
+namespace CollaborativePlatformMain.Form.MessageSubPage
+{
+    /// <summary>
+    /// SeconArticleReviewPage.xaml 的交互逻辑
+    /// </summary>
+    public partial class SeconArticleReviewPage : Page
+    {
+        public SeconArticleReviewPage()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 窗体初始化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

+ 31 - 3
CollaborativePlatformMain/Form/MessageSubPage/SeconThreeDimensionalPage.xaml

@@ -44,12 +44,40 @@
                 <Button Name="upDrawing" Content="上传" Width="80" Height="26" Click="upDrawing_Click"/>
             </StackPanel>
 
-            <!--模型应用-->
-            <StackPanel Name="sp_modelUser" Visibility="Collapsed" Margin="10,10,0,0">
+            <!--碰撞检测-->
+            <StackPanel Name="sp_modelUser1" Visibility="Collapsed" Margin="10,10,0,0">
 
                 <DockPanel>
                     <Label Content="选择模型:"/>
-                    <TextBox Text="双击选择模型地址" Name="selectModelApplication" Width="300" Height="26" Foreground="Red" HorizontalAlignment="Left" MouseDoubleClick="TextBox_MouseDoubleClick"/>
+                    <TextBox Text="双击选择模型地址" Name="selectModelApplication1" Width="300" Height="26" Foreground="Red" HorizontalAlignment="Left" MouseDoubleClick="TextBox_MouseDoubleClick1"/>
+                </DockPanel>
+
+                <DockPanel HorizontalAlignment="Left" Margin="50,10,0,0">
+                    <Button Content="上传" Width="80" Height="26"/>
+                </DockPanel>
+
+            </StackPanel>
+
+           <!--净高分析-->
+            <StackPanel Name="sp_modelUser2" Visibility="Collapsed" Margin="10,10,0,0">
+
+                <DockPanel>
+                    <Label Content="选择模型:"/>
+                    <TextBox Text="双击选择模型地址" Name="selectModelApplication2" Width="300" Height="26" Foreground="Red" HorizontalAlignment="Left" MouseDoubleClick="TextBox_MouseDoubleClick2"/>
+                </DockPanel>
+
+                <DockPanel HorizontalAlignment="Left" Margin="50,10,0,0">
+                    <Button Content="上传" Width="80" Height="26"/>
+                </DockPanel>
+
+            </StackPanel>
+
+            <!--条文审查-->
+            <StackPanel Name="sp_modelUser3" Visibility="Collapsed" Margin="10,10,0,0">
+
+                <DockPanel>
+                    <Label Content="选择模型:"/>
+                    <TextBox Text="双击选择模型地址" Name="selectModelApplication3" Width="300" Height="26" Foreground="Red" HorizontalAlignment="Left" MouseDoubleClick="TextBox_MouseDoubleClick3"/>
                 </DockPanel>
 
                 <DockPanel HorizontalAlignment="Left" Margin="50,10,0,0">

+ 72 - 46
CollaborativePlatformMain/Form/MessageSubPage/SeconThreeDimensionalPage.xaml.cs

@@ -72,42 +72,6 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
         }
 
         /// <summary>
-        /// 自动建模
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void bt_autoModel_Click(object sender, RoutedEventArgs e)
-        {
-            sp_autoModel.Visibility = Visibility.Visible;
-            sp_modelUser.Visibility = Visibility.Collapsed;
-            sp_modelEmploy.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 模型应用
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void bt_modelUser_Click(object sender, RoutedEventArgs e)
-        {
-            sp_autoModel.Visibility = Visibility.Collapsed;
-            sp_modelUser.Visibility = Visibility.Visible;
-            sp_modelEmploy.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// 模型服务
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void bt_modelEmploy_Click(object sender, RoutedEventArgs e)
-        {
-            sp_autoModel.Visibility = Visibility.Collapsed;
-            sp_modelUser.Visibility = Visibility.Collapsed;
-            sp_modelEmploy.Visibility = Visibility.Visible;
-        }
-
-        /// <summary>
         /// 创建标高体系
         /// </summary>
         /// <param name="sender"></param>
@@ -186,37 +150,49 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
             if (value == "自动建模")
             {
                 sp_autoModel.Visibility = Visibility.Visible;
-                sp_modelUser.Visibility = Visibility.Collapsed;
+                sp_modelUser1.Visibility = Visibility.Collapsed;
+                sp_modelUser2.Visibility = Visibility.Collapsed;
+                sp_modelUser3.Visibility = Visibility.Collapsed;
                 sp_modelEmploy.Visibility = Visibility.Collapsed;
             }
             else if (value == "模型应用")
             {
-                sp_autoModel.Visibility = Visibility.Collapsed;
-                sp_modelUser.Visibility = Visibility.Visible;
-                sp_modelEmploy.Visibility = Visibility.Collapsed;
+                //sp_autoModel.Visibility = Visibility.Collapsed;
+                //sp_modelUser1.Visibility = Visibility.Collapsed;
+                //sp_modelUser2.Visibility = Visibility.Collapsed;
+                //sp_modelUser3.Visibility = Visibility.Collapsed;
+                //sp_modelEmploy.Visibility = Visibility.Collapsed;
             }
             else if (value == "模型服务")
             {
                 sp_autoModel.Visibility = Visibility.Collapsed;
-                sp_modelUser.Visibility = Visibility.Collapsed;
+                sp_modelUser1.Visibility = Visibility.Collapsed;
+                sp_modelUser2.Visibility = Visibility.Collapsed;
+                sp_modelUser3.Visibility = Visibility.Collapsed;
                 sp_modelEmploy.Visibility = Visibility.Visible;
             }
             else if (value == "碰撞检查")
             {
                 sp_autoModel.Visibility = Visibility.Collapsed;
-                sp_modelUser.Visibility = Visibility.Visible;
+                sp_modelUser1.Visibility = Visibility.Visible;
+                sp_modelUser2.Visibility = Visibility.Collapsed;
+                sp_modelUser3.Visibility = Visibility.Collapsed;
                 sp_modelEmploy.Visibility = Visibility.Collapsed;
             }
             else if (value == "净高分析")
             {
                 sp_autoModel.Visibility = Visibility.Collapsed;
-                sp_modelUser.Visibility = Visibility.Visible;
+                sp_modelUser1.Visibility = Visibility.Collapsed;
+                sp_modelUser2.Visibility = Visibility.Visible;
+                sp_modelUser3.Visibility = Visibility.Collapsed;
                 sp_modelEmploy.Visibility = Visibility.Collapsed;
             }
             else if (value == "条文审查")
             {
                 sp_autoModel.Visibility = Visibility.Collapsed;
-                sp_modelUser.Visibility = Visibility.Visible;
+                sp_modelUser1.Visibility = Visibility.Collapsed;
+                sp_modelUser2.Visibility = Visibility.Collapsed;
+                sp_modelUser3.Visibility = Visibility.Visible;
                 sp_modelEmploy.Visibility = Visibility.Collapsed;
             }
         }
@@ -232,8 +208,8 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
             bool isSelectDwg = ShowSelectDWGFiles(out string filePath);
             if (isSelectDwg)
             {
-                selectModelApplication.Text = "";
-                selectModelApplication.Text = filePath;
+                selectModelApplication1.Text = "";
+                selectModelApplication1.Text = filePath;
             }
         }
 
@@ -284,6 +260,56 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
             {
                 selectModelServices.Text = "";
                 selectModelServices.Text = filePath;
+                selectModelServices.Foreground = Brushes.Black;
+            }
+        }
+
+        /// <summary>
+        /// 碰撞检测
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TextBox_MouseDoubleClick1(object sender, MouseButtonEventArgs e)
+        {
+            bool isSelectDwg = ShowSelectDWGFiles(out string filePath);
+            if (isSelectDwg)
+            {
+                selectModelApplication1.Text = "";
+                selectModelApplication1.Text = filePath;
+                selectModelApplication1.Foreground = Brushes.Black;
+            }
+        }
+
+        /// <summary>
+        /// 净高分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TextBox_MouseDoubleClick2(object sender, MouseButtonEventArgs e)
+        {
+            bool isSelectDwg = ShowSelectDWGFiles(out string filePath);
+            if (isSelectDwg)
+            {
+                selectModelApplication2.Text = "";
+                selectModelApplication2.Text = filePath;
+                selectModelApplication2.Foreground = Brushes.Black;
+            }
+
+        }
+
+        /// <summary>
+        /// 条文审查
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TextBox_MouseDoubleClick3(object sender, MouseButtonEventArgs e)
+        {
+            bool isSelectDwg = ShowSelectDWGFiles(out string filePath);
+            if (isSelectDwg)
+            {
+                selectModelApplication3.Text = "";
+                selectModelApplication3.Text = filePath;
+                selectModelApplication3.Foreground = Brushes.Black;
             }
         }
     }

+ 57 - 9
CollaborativePlatformMain/Form/UploadDrawingForm.xaml.cs

@@ -127,10 +127,17 @@ namespace CollaborativePlatformMain.Form
         /// <param name="operatEntities"></param>
         public void SetOPerData(List<FloorLayerData> floorLayerDatas, ref ObservableCollection<OperatEntity> operatEntities)
         {
+            //D盘
+            string dPath = Global.GetDriveLetterExceptC();
+
+            //原图纸
+            WholePictureDataConfigUtil wholePictureDataConfigUtil = new WholePictureDataConfigUtil();
+            WholePictureData wholePictureData = wholePictureDataConfigUtil.Load<WholePictureData>(string.Format(@"{0}\DFBIM\WholePicture.config", dPath));
 
             //二级
             ObservableCollection<OperatEntity> twoDatas = new ObservableCollection<OperatEntity>();
-            twoDatas.Add(new OperatEntity("原图纸", "", new ObservableCollection<OperatEntity>(), false));
+            twoDatas.Add(new OperatEntity("原图纸", wholePictureData.Path,
+                                          new ObservableCollection<OperatEntity>(), false));
 
             //对比图
             if (IsRenew)
@@ -147,7 +154,42 @@ namespace CollaborativePlatformMain.Form
                     ObservableCollection<OperatEntity> duibiDatas = new ObservableCollection<OperatEntity>();
                     foreach (var nativeDataInfo in selNativeDatas)
                     {
-                        duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, "", new ObservableCollection<OperatEntity>(), false));
+                        if (nativeDataInfo.Name.Contains("F1"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F1-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                            new ObservableCollection<OperatEntity>(), false));
+                        }
+                        else if (nativeDataInfo.Name.Contains("F2"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F2-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                            new ObservableCollection<OperatEntity>(), false));
+                        }
+                        else if (nativeDataInfo.Name.Contains("F3"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F3-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                           new ObservableCollection<OperatEntity>(), false));
+                        }
+                        else if (nativeDataInfo.Name.Contains("F4"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F4-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                            new ObservableCollection<OperatEntity>(), false));
+                        }
+                        else if (nativeDataInfo.Name.Contains("F5"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F5-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                           new ObservableCollection<OperatEntity>(), false));
+                        }
+                        else if (nativeDataInfo.Name.Contains("F6"))
+                        {
+                            string path = string.Format(@"{0}\DFBIM\协同演示\对比图\F6-对比.dwg", dPath);
+                            duibiDatas.Add(new OperatEntity(nativeDataInfo.Name, path,
+                                                            new ObservableCollection<OperatEntity>(), false));
+                        }
                     }
                     twoDatas.Add(new OperatEntity("对比图-" + banben, "", duibiDatas, false));
                 }
@@ -156,7 +198,7 @@ namespace CollaborativePlatformMain.Form
 
             //三级
             ObservableCollection<OperatEntity> threeDatas = new ObservableCollection<OperatEntity>();
-            threeDatas.Add(new OperatEntity("整栋图", "", new ObservableCollection<OperatEntity>(), false));
+            threeDatas.Add(new OperatEntity("整栋图", wholePictureData.Path, new ObservableCollection<OperatEntity>(), false));
 
             //四级
             ObservableCollection<OperatEntity> fourDatas = new ObservableCollection<OperatEntity>();
@@ -235,7 +277,8 @@ namespace CollaborativePlatformMain.Form
             // 创建FileSystemWatcher实例
             fileSystemWatcher = new FileSystemWatcher();
             // 设置要监视的文件夹路径
-            fileSystemWatcher.Path = @"D:\DFBIM";
+            string dPath = Global.GetDriveLetterExceptC();
+            fileSystemWatcher.Path = string.Format(@"{0}\DFBIM", dPath);
 
             // 设置要监视的更改类型
             fileSystemWatcher.NotifyFilter = NotifyFilters.LastAccess |
@@ -275,8 +318,11 @@ namespace CollaborativePlatformMain.Form
         /// <param name="e"></param>
         void fsw_Changed(object sender, FileSystemEventArgs e)
         {
-            //重新设置定时器的触发间隔,并且仅仅触发一次
-            m_timer.Change(TimeoutMillis, Timeout.Infinite);
+            if (e.Name.Contains("FloorLayerData"))
+            {
+                //重新设置定时器的触发间隔,并且仅仅触发一次
+                m_timer.Change(TimeoutMillis, Timeout.Infinite);
+            }
         }
 
         /// <summary>
@@ -286,9 +332,11 @@ namespace CollaborativePlatformMain.Form
         /// <param name="e"></param>
         private void OnChanged(object source)
         {
+            string dPath = Global.GetDriveLetterExceptC();
+
             //读取配置文件数据
             FloorDataConfigUtil xmlInfo = new FloorDataConfigUtil();
-            ArchLayerDatas.AddRange(xmlInfo.Load<List<FloorLayerData>>(@"D:\DFBIM\FloorLayerData.config"));
+            ArchLayerDatas.AddRange(xmlInfo.Load<List<FloorLayerData>>(string.Format(@"{0}\DFBIM\FloorLayerData.config", dPath)));
 
             Dictionary<int, string> keyValuePairs = new Dictionary<int, string>();
             keyValuePairs.Add(0, "风管");
@@ -311,8 +359,8 @@ namespace CollaborativePlatformMain.Form
             }
             WarmLayerDatas = warmDatas;
 
-            // 停止监视
-            fileSystemWatcher.EnableRaisingEvents = false;
+            //// 停止监视
+            //fileSystemWatcher.EnableRaisingEvents = false;
         }
 
 

+ 12 - 3
CollaborativePlatformMain/MainWindow.xaml

@@ -54,6 +54,11 @@
                 </StackPanel>
 
                 <StackPanel Name="sp_Register" Margin="0 50 0 0" Visibility="Collapsed">
+
+                    <DockPanel>
+                        <Button Content="返回" HorizontalAlignment="Left" Margin="10,-60,0,0" Click="Button_Click_3"/>
+                    </DockPanel>
+
                     <!--账户密码-->
                     <DockPanel>
                         <LayUI:LayTextBlock Width="70" FontSize="18" Margin="30 0 0 0" Text="账号:" VerticalAlignment="Center"></LayUI:LayTextBlock>
@@ -78,6 +83,10 @@
 
                 <StackPanel Name="sp_temporaryLogin" Margin="0 100 0 0"  Visibility="Collapsed">
 
+                    <DockPanel>
+                        <Button Content="返回" HorizontalAlignment="Left" Margin="10,-140,0,0" Click="Button_Click_2"/>
+                    </DockPanel>
+
                     <!--账户密码-->
                     <DockPanel>
                         <LayUI:LayTextBlock Width="70" FontSize="18" Margin="30 0 0 0" Text="邀请码:"  VerticalAlignment="Center"></LayUI:LayTextBlock>
@@ -91,14 +100,14 @@
 
                 </StackPanel>
 
-                <DockPanel>
+                <!--<DockPanel>
                     <Button Width="80" Content="楼栋管理器" Click="Button_Click"/>
                     <Button Width="80" Content="再次楼栋" Click="Button_Click"/>
                     
                     <Button Width="80" Content="打开图纸" Click="Button_Click_1"/>
                     <Button Width="80" Content="再次打开图纸" Click="Button_Click_1"/>
-                </DockPanel>
-                
+                </DockPanel>-->
+
             </StackPanel>
         </Border>
     </LayUI:LayTitleBar>

+ 28 - 2
CollaborativePlatformMain/MainWindow.xaml.cs

@@ -7,6 +7,7 @@ using DFBIM.CADNETCommon.ReconStruct;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -144,12 +145,37 @@ namespace CollaborativePlatformMain
         /// <param name="e"></param>
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            StartCADUtil.StartCADMath(true);
+
         }
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
-            StartCADUtil.StartCADMath(false,new OpenDrawPathData(true, @"C:\Users\jiantu\Desktop\Drawing2.dwg"));
+            StartCADUtil.StartCADMath(false, new OpenDrawPathData(true, @"C:\Users\jiantu\Desktop\Drawing2.dwg"));
+        }
+
+
+        /// <summary>
+        /// 邀请码返回
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            sp_Login.Visibility = Visibility.Visible;
+            sp_Register.Visibility = Visibility.Collapsed;
+            sp_temporaryLogin.Visibility = Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// 临时登录返回
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            sp_Login.Visibility = Visibility.Visible;
+            sp_Register.Visibility = Visibility.Collapsed;
+            sp_temporaryLogin.Visibility = Visibility.Collapsed;
         }
     }
 }

BIN
CollaborativePlatformMain/SystemLibrary/Other/HandyControl.dll


BIN
CollaborativePlatformMain/SystemLibrary/Other/LayUI.Wpf.dll


+ 48 - 0
CollaborativePlatformMain/packages.config

@@ -1,6 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Costura.Fody" version="5.8.0-alpha0098" targetFramework="net48" developmentDependency="true" />
+  <package id="Fody" version="6.6.0" targetFramework="net48" developmentDependency="true" />
   <package id="HandyControl" version="3.5.1" targetFramework="net48" />
   <package id="LayUI.Wpf" version="1.0.2.240407" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net48" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="NETStandard.Library" version="1.6.1" targetFramework="net48" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net48" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
+  <package id="System.Console" version="4.3.0" targetFramework="net48" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net48" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
   <package id="System.Drawing.Common" version="8.0.3" targetFramework="net48" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net48" />
+  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net48" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
+  <package id="System.Net.Http" version="4.3.0" targetFramework="net48" />
+  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="net48" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net48" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net48" />
+  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net48" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net48" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net48" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net48" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net48" />
+  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net48" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
 </packages>