补充窗体

CollaborativePlatformMain/CollaborativePlatformMain.csproj

@@ -87,12 +87,17 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="DFEntity\FloorLayerData.cs" />
     <Compile Include="DFEntity\MessageSubUtil\ContactsUtil.cs" />
     <Compile Include="DFEntity\MessageSubUtil\LegendEntity.cs" />
     <Compile Include="DFEntity\MessageSubUtil\LevelTableEntity.cs" />
     <Compile Include="DFEntity\MessageSubUtil\MessageData.cs" />
     <Compile Include="DFEntity\MessageSubUtil\ThreeModelEntity.cs" />
+    <Compile Include="DFEntity\MessageSubUtil\ToolFunctionEntity.cs" />
     <Compile Include="DFEntity\StandardizedEntity.cs" />
+    <Compile Include="Form\FloorDrawingForm.xaml.cs">
+      <DependentUpon>FloorDrawingForm.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Form\MessageSubPage\AddImage\AddImageForm.xaml.cs">
       <DependentUpon>AddImageForm.xaml</DependentUpon>
     </Compile>
@@ -102,6 +107,9 @@
     <Compile Include="Form\MessageSubPage\CreatLevel\SetLevelTablecreationForm.xaml.cs">
       <DependentUpon>SetLevelTablecreationForm.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Form\MessageSubPage\Project\NewProjrctPage.xaml.cs">
+      <DependentUpon>NewProjrctPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Form\MessageSubPage\SeconContactsPage.xaml.cs">
       <DependentUpon>SeconContactsPage.xaml</DependentUpon>
     </Compile>
@@ -111,12 +119,18 @@
     <Compile Include="Form\MessageSubPage\SeconMessagePage.xaml.cs">
       <DependentUpon>SeconMessagePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Form\MessageSubPage\SeconProjectPage.xaml.cs">
+      <DependentUpon>SeconProjectPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Form\MessageSubPage\SeconThreeDimensionalPage.xaml.cs">
       <DependentUpon>SeconThreeDimensionalPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Form\MessageSubPage\SeconToolLibraryPage.xaml.cs">
       <DependentUpon>SeconToolLibraryPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Form\MessageSubPage\SuspensionForm.xaml.cs">
+      <DependentUpon>SuspensionForm.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Form\StandardizedAssistantForm.xaml.cs">
       <DependentUpon>StandardizedAssistantForm.xaml</DependentUpon>
     </Compile>
@@ -129,6 +143,10 @@
     <Compile Include="Util\CollaborationUtil.cs" />
     <Compile Include="Util\CreatLevelUtil.cs" />
     <Compile Include="Util\LoginUtil.cs" />
+    <Page Include="Form\FloorDrawingForm.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Form\MessageSubPage\AddImage\AddImageForm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -141,6 +159,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Form\MessageSubPage\Project\NewProjrctPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Form\MessageSubPage\SeconContactsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -153,6 +175,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Form\MessageSubPage\SeconProjectPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Form\MessageSubPage\SeconThreeDimensionalPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -161,6 +187,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Form\MessageSubPage\SuspensionForm.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Form\StandardizedAssistantForm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -181,10 +211,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Form\ToolsForm.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Form\UploadDrawingForm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -208,9 +234,6 @@
     <Compile Include="Form\ProjectForm.xaml.cs">
       <DependentUpon>ProjectForm.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Form\ToolsForm.xaml.cs">
-      <DependentUpon>ToolsForm.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Form\UploadDrawingForm.xaml.cs">
       <DependentUpon>UploadDrawingForm.xaml</DependentUpon>
     </Compile>

CollaborativePlatformMain/DFEntity/FloorLayerData.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CollaborativePlatformMain.DFEntity
+{
+    /// <summary>
+    /// 
+    /// <para>文件名(File Name):     FloorLayerData.cs</para>
+    /// 
+    /// <para>描述(Description):     楼层管理器数据</para>
+    /// 
+    /// <para>数据表(Tables):        nothing</para>
+    /// 
+    /// <para>作者(Author):          Ou Rui Song</para>
+    /// 
+    /// <para>日期(Create Date):     2024年4月30日15:55:58</para>
+    /// 
+    /// 修改记录(Revision History):
+    ///     R1:
+    ///         修改作者:
+    ///         修改日期:
+    ///         修改理由:
+    /// 
+    /// </summary>
+    public class FloorLayerData
+    {
+
+        /// <summary>
+        /// 图层管理器
+        /// </summary>
+        /// <param name="layerName"></param>
+        public FloorLayerData(string layerName)
+        {
+            LayerName = layerName;
+        }
+
+        /// <summary>
+        /// 楼层管理器
+        /// </summary>
+        /// <param name="floorName"></param>
+        /// <param name="subDatas"></param>
+        public FloorLayerData(string floorName, List<FloorLayerData> subDatas) : this(floorName)
+        {
+            SubDatas = subDatas;
+        }
+
+
+
+
+        /// <summary>
+        /// 楼层名称
+        /// </summary>
+        public string FloorName { get; set; }
+
+        /// <summary>
+        /// 图层数据
+        /// </summary>
+        public List<FloorLayerData> SubDatas { get; set; } = new List<FloorLayerData>();
+
+        /// <summary>
+        /// 图层名
+        /// </summary>
+        public string LayerName { get; set; }
+
+    }
+}

CollaborativePlatformMain/DFEntity/MessageSubUtil/ToolFunctionEntity.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CollaborativePlatformMain.DFEntity.MessageSubUtil
+{
+    /// <summary>
+    /// 
+    /// <para>文件名(File Name):     ToolFunctionEntity.cs</para>
+    /// 
+    /// <para>描述(Description):     工具栏数据</para>
+    /// 
+    /// <para>数据表(Tables):        nothing</para>
+    /// 
+    /// <para>作者(Author):          Ou Rui Song</para>
+    /// 
+    /// <para>日期(Create Date):     2024年4月30日10:14:07</para>
+    /// 
+    /// 修改记录(Revision History):
+    ///     R1:
+    ///         修改作者:
+    ///         修改日期:
+    ///         修改理由:
+    /// 
+    /// </summary>
+    public class ToolFunctionEntity
+    {
+        /// <summary>
+        /// 工具栏数据
+        /// </summary>
+        /// <param name="funcitonSystemName"></param>
+        /// <param name="subDatas"></param>
+        public ToolFunctionEntity(string funcitonSystemName, List<ToolFunctionEntity> subDatas)
+        {
+            FuncitonSystemName = funcitonSystemName;
+            SubDatas = subDatas;
+        }
+
+        /// <summary>
+        /// 单功能数据
+        /// </summary>
+        /// <param name="funcitonName"></param>
+        /// <param name="imagePath"></param>
+        /// <param name="isCheck"></param>
+        public ToolFunctionEntity(string funcitonName, string imagePath, bool isCheck)
+        {
+            FuncitonName = funcitonName;
+            ImagePath = imagePath;
+            IsCheck = isCheck;
+        }
+
+
+
+        /// <summary>
+        /// 功能分类
+        /// </summary>
+        public string FuncitonSystemName { get; set; }
+
+        /// <summary>
+        /// 子级
+        /// </summary>
+        public List<ToolFunctionEntity> SubDatas { get; set; } = new List<ToolFunctionEntity>();
+
+
+
+        /// <summary>
+        /// 功能名称
+        /// </summary>
+        public string FuncitonName { get; set; }
+
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string ImagePath { get; set; }
+
+        /// <summary>
+        /// 是否选中
+        /// </summary>
+        public bool IsCheck { get; set; }
+
+    }
+}

CollaborativePlatformMain/Form/FloorDrawingForm.xaml

@@ -0,0 +1,56 @@
+<Window x:Class="CollaborativePlatformMain.Form.FloorDrawingForm"
+        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"
+        mc:Ignorable="d" Title="楼层管理器"  WindowStartupLocation="CenterScreen"
+        SizeToContent="WidthAndHeight"  ResizeMode="NoResize" Loaded="Window_Loaded"
+        Closed="Window_Closed">
+    <DockPanel>
+
+        <StackPanel Width="120" Height="400" >
+            <Border BorderBrush="Black"  BorderThickness="1"  Width="120" Height="400">
+
+                <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="0,0,0,20" >
+                    <ItemsControl x:Name="sv_floor" >
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel MouseDown="StackPanel_MouseDown" Margin="10,0,0,0">
+                                    <TextBlock Name="tb_name" Text="{Binding FuncitonName}" HorizontalAlignment="Center" />
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </Border>
+        </StackPanel>
+
+        <StackPanel Width="200" Height="400">
+            <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="0,0,0,20">
+                <ItemsControl x:Name="sv_layer" >
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel/>
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel MouseDown="StackPanel_MouseDown" Margin="10,0,0,0">
+                                <TextBlock Name="tb_name" Text="{Binding FuncitonName}" HorizontalAlignment="Center" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </StackPanel>
+
+    </DockPanel>
+</Window>

CollaborativePlatformMain/Form/FloorDrawingForm.xaml.cs

@@ -0,0 +1,56 @@
+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
+{
+    /// <summary>
+    /// FloorDrawingForm.xaml 的交互逻辑
+    /// </summary>
+    public partial class FloorDrawingForm : Window
+    {
+        /// <summary>
+        /// 楼层管理器
+        /// </summary>
+        public FloorDrawingForm()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 窗体初始化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+
+     
+        /// <summary>
+        /// 窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Closed(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

CollaborativePlatformMain/Form/HomepageForm.xaml

@@ -69,231 +69,8 @@
                     </DockPanel>
 
                     <!--项目-->
-                    <DockPanel Name="dp_project" Visibility="Collapsed">
-
-                        <!--中间-->
-                        <!--
-                    <StackPanel Width="180" Height="123" HorizontalAlignment="Left" Background="WhiteSmoke">
-                    </StackPanel>-->
-
-                        <Grid>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="28" />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-
-                            <Button Grid.Row="0" Width="180" Content="新增项目" Click="bt_addPro" />
-                            <!--中间-->
-                            <TreeView  Grid.Row="1" x:Name="tr_vw"  Visibility="Visible" PreviewMouseLeftButtonUp="tv_projectLeftButtonUp"
-                                  Width="180"  HorizontalAlignment="Left" Background="WhiteSmoke">
-                                <TreeView.ItemTemplate>
-                                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
-                                        <TextBlock Text="{Binding Name}" />
-                                    </HierarchicalDataTemplate>
-                                </TreeView.ItemTemplate>
-                            </TreeView>
-                        </Grid>
-
-                        <!--最右边-->
-                        <StackPanel
-                            Name="sp_info" Width="483" Margin="0 10 0 0"
-                            HorizontalAlignment="Left" Visibility="Collapsed">
-
-                            <ListView HorizontalAlignment="Left" Background="White" BorderThickness="0"
-                      VerticalAlignment="Top" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                      ScrollViewer.VerticalScrollBarVisibility="Hidden" Width="483"
-                      x:Name="lv_projectInfo"  Height="300" d:ItemsSource="{d:SampleData ItemCount=5}" Visibility="Collapsed">
-
-                                <!--隐藏列头-->
-                                <ListView.Resources>
-                                    <Style TargetType="{x:Type GridViewColumnHeader}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
-                                    </Style>
-                                </ListView.Resources>
-
-                                <ListView.ItemContainerStyle>
-                                    <Style TargetType="ListViewItem">
-                                        <Setter Property="Height" Value="35" />
-                                    </Style>
-                                </ListView.ItemContainerStyle>
-
-                                <ListView.View>
-                                    <GridView  x:Name="gridview">
-                                        <GridViewColumn  Width="190" x:Name="Column1">
-                                            <GridViewColumn.CellTemplate>
-                                                <DataTemplate>
-                                                    <TextBlock  HorizontalAlignment="Left" Height="20" TextWrapping="Wrap"
-                                                            Text="{Binding Content}"
-                                                            VerticalAlignment="Center" />
-                                                </DataTemplate>
-                                            </GridViewColumn.CellTemplate>
-                                        </GridViewColumn>
-
-                                        <GridViewColumn  Width="130" x:Name="Column2">
-                                            <GridViewColumn.CellTemplate>
-                                                <DataTemplate>
-
-                                                    <DockPanel>
-                                                        <Button  Tag="{Binding}" Content="修改" Click="btn_lv_update" FontSize="13" />
-                                                    </DockPanel>
-                                                </DataTemplate>
-                                            </GridViewColumn.CellTemplate>
-                                        </GridViewColumn>
-                                    </GridView>
-                                </ListView.View>
-                            </ListView>
-                        </StackPanel>
-
-                        <StackPanel Name="sp_work" Visibility="Collapsed" Height="428" Width="485" VerticalAlignment="Top">
-
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                <TextBlock Text="本专业" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" PreviewMouseLeftButtonUp="pre_Click" />
-                                <TextBlock Text="/" Margin="0,0,0,0" FontSize="20" VerticalAlignment="Center" />
-                                <TextBlock Text="全专业" Margin="0,0,0,0" FontSize="20" VerticalAlignment="Center" PreviewMouseLeftButtonUp="all_Click" />
-                            </StackPanel>
-
-                            <TreeView x:Name="tr_is" Visibility="Visible" 
-                                      PreviewMouseLeftButtonUp="tr_is_PreviewMouseLeftButtonUp" 
-                                      Height="370" Width="485" HorizontalAlignment="Left">
-                                <TreeView.ItemTemplate>
-                                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
-                                        <TextBlock Text="{Binding Name}" />
-                                    </HierarchicalDataTemplate>
-                                </TreeView.ItemTemplate>
-                            </TreeView>
-
-                            <ScrollViewer x:Name="tr_all" Visibility="Collapsed" Height="370" 
-                                          HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">
-                                <StackPanel  x:Name="tr_all1" Orientation="Horizontal" Visibility="Visible">
-
-                                    <Border  BorderBrush="Green" BorderThickness="0.5" Width="200">
-
-                                        <StackPanel>
-
-                                            <TextBlock Text="建筑" HorizontalAlignment="Center" FontSize="25" Grid.Row="0" />
-                                            <TreeView  x:Name="tv_building" Height="336">
-                                                <TreeView.ItemTemplate>
-                                                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
-                                                        <TextBlock Text="{Binding Name}" />
-                                                    </HierarchicalDataTemplate>
-                                                </TreeView.ItemTemplate>
-                                            </TreeView>
-                                        </StackPanel>
-                                    </Border>
-                                    <Border  BorderBrush="Green" BorderThickness="0.5,0,0,0.5" Width="200">
-                                        <TextBlock Text="结构" HorizontalAlignment="Center" FontSize="25" />
-                                    </Border>
-                                    <Border  BorderBrush="Green" BorderThickness="0.5,0,0,0.5" Width="200">
-                                        <TextBlock Text="给排水" HorizontalAlignment="Center" FontSize="25" />
-                                    </Border>
-                                    <Border  BorderBrush="Green" BorderThickness="0.5,0,0,0.5" Width="200">
-                                        <TextBlock Text="暖通" HorizontalAlignment="Center" FontSize="25" />
-                                    </Border>
-                                    <Border  BorderBrush="Green" BorderThickness="0.5,0,0,0.5" Width="200">
-                                        <TextBlock Text="电气" HorizontalAlignment="Center" FontSize="25" />
-                                    </Border>
-                                </StackPanel>
-                            </ScrollViewer>
-
-                            <DockPanel>
-                                <Button Visibility="Collapsed" Name="bt_proBig"  Content="放大" 
-                                        HorizontalAlignment="Right" Margin="0 0 10 0" Click="bt_proBigClick"/>
-                            </DockPanel>
-                        </StackPanel>
-
-                        <StackPanel Name="sp_addPro" Visibility="Collapsed" Width="473" Margin="10 10 0 0">
-                            <StackPanel x:Name="gd_top" Orientation="Horizontal">
-                                <TextBlock Text="完整的项目信息有助于为您推送规范条文" Margin="0,10,10,10" />
-                                <CheckBox Content="不再提醒" Click="close_Click" Margin="10" />
-                            </StackPanel>
-
-                            <!--项目名称-->
-                            <DockPanel>
-                                <LayUI:LayTextBlock Width="80" FontSize="13" Margin="30 0 0 0" Text="项目名称："  VerticalAlignment="Center"></LayUI:LayTextBlock>
-                                <TextBox Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" x:Name="pro_Name" />
-                            </DockPanel>
-
-                            <!--项目地址-->
-                            <DockPanel Margin="0 10 0 0">
-                                <LayUI:LayTextBlock Width="80" FontSize="13" Margin="30 0 0 0" Text="项目名称："  VerticalAlignment="Center"></LayUI:LayTextBlock>
-                                <TextBox Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" x:Name="pro_status" />
-                            </DockPanel>
-
-                            <TextBlock Text="选择：" FontSize="13" Margin="0,10,0,0" />
-                            <TextBlock Text="组建团队：" FontSize="13" Margin="0,2,0,0" />
-
-                            <StackPanel Orientation="Vertical" Margin="20 0 0 0">
-                                <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                                    <TextBlock Text="专业" Margin="20,0,0,0" VerticalAlignment="Center" FontSize="16" />
-                                    <TextBlock Text="人员" Margin="120,0,0,0" VerticalAlignment="Center" FontSize="16" />
-                                </StackPanel>
-                                <StackPanel Margin="5,20,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="建筑" Margin="20,0,0,0" VerticalAlignment="Center" />
-                                    <Button Margin="120,0,0,0" Content="选择人员" x:Name="bd_btn"
-                                        Initialized="bd_Initialized" Click="bd_Click" Height="25" FontSize="8" Width="60">
-                                        <Button.ContextMenu>
-                                            <ContextMenu Name="contextMenu">
-                                                <MenuItem Header="选择通讯录" Name="savePage" Click="savePage_Click" />
-                                                <MenuItem Header="临时邀请" Name="saveFile" Click="saveFile_Click" />
-                                            </ContextMenu>
-                                        </Button.ContextMenu>
-                                    </Button>
-                                </StackPanel>
-                                <StackPanel Margin="5,10,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="结构" Margin="20,0,0,0" VerticalAlignment="Center" />
-                                    <Button Margin="120,0,0,0" Content="选择人员" x:Name="bd_st"
-                                        Initialized="st_Initialized" Click="st_Click" Height="25" FontSize="8" Width="60">
-                                        <Button.ContextMenu>
-                                            <ContextMenu Name="st_mu">
-                                                <MenuItem Header="选择通讯录" Name="st_num" Click="savePage_Click" />
-                                                <MenuItem Header="临时邀请" Name="st_tm" Click="saveFile_Click" />
-                                            </ContextMenu>
-                                        </Button.ContextMenu>
-                                    </Button>
-                                </StackPanel>
-                                <StackPanel Margin="5,10,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="给排水" Margin="20,0,0,0" VerticalAlignment="Center" />
-                                    <Button Margin="108,0,0,0" Content="选择人员" x:Name="bd_wt"
-                                        Initialized="wt_Initialized" Click="wt_Click" Height="25" FontSize="8" Width="60">
-                                        <Button.ContextMenu>
-                                            <ContextMenu Name="wt_mu">
-                                                <MenuItem Header="选择通讯录" Name="wt_num" Click="savePage_Click" />
-                                                <MenuItem Header="临时邀请" Name="wt_tm" Click="saveFile_Click" />
-                                            </ContextMenu>
-                                        </Button.ContextMenu>
-                                    </Button>
-                                </StackPanel>
-                                <StackPanel Margin="5,10,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="暖通" Margin="20,0,0,0" VerticalAlignment="Center" />
-                                    <Button Margin="120,0,0,0" Content="选择人员" x:Name="bd_wm"
-                                        Initialized="wm_Initialized" Click="wm_Click" Height="25" FontSize="8" Width="60">
-                                        <Button.ContextMenu>
-                                            <ContextMenu Name="wm_mu">
-                                                <MenuItem Header="选择通讯录" Name="wm_num" Click="savePage_Click" />
-                                                <MenuItem Header="临时邀请" Name="wm_tm" Click="saveFile_Click" />
-                                            </ContextMenu>
-                                        </Button.ContextMenu>
-                                    </Button>
-                                </StackPanel>
-                                <StackPanel Margin="5,10,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="电气" Margin="20,0,0,0" VerticalAlignment="Center" />
-                                    <Button Margin="120,0,0,0" Content="选择人员" x:Name="bd_ele"
-                                        Initialized="ele_Initialized" Click="ele_Click" Height="25" FontSize="8" Width="60">
-                                        <Button.ContextMenu>
-                                            <ContextMenu Name="ele_mu">
-                                                <MenuItem Header="选择通讯录" Name="ele_num" Click="savePage_Click" />
-                                                <MenuItem Header="临时邀请" Name="ele_tm" Click="saveFile_Click" />
-                                            </ContextMenu>
-                                        </Button.ContextMenu>
-                                    </Button>
-                                </StackPanel>
-                                <StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-                                    <TextBlock Text="+" Margin="25,0,0,0" VerticalAlignment="Center" />
-                                </StackPanel>
-                            </StackPanel>
-                            <Button Content="提交" Width="50" Click="submit_Click" Margin="0,10,0,0" />
-                        </StackPanel>
+                    <DockPanel Name="dp_project" Visibility="Visible">
+                        <Frame Name="seconProjectPage" NavigationUIVisibility="Hidden"/>
                     </DockPanel>
 
                     <!--联系人-->
@@ -308,20 +85,7 @@
 
                     <!--工具库-->
                     <DockPanel Name="dp_tools" Visibility="Visible">
-
-                        <StackPanel Name="sp_tools" Width="180" HorizontalAlignment="Left" Background="WhiteSmoke">
-                        </StackPanel>
-
-                        <!--最右边-->
-                        <StackPanel Height="420"  VerticalAlignment="Top" Width="483"
-                                Margin="0 10 0 0"  HorizontalAlignment="Left">
-
-                            <WrapPanel Name="wp_tools" Margin="0 0 0 0" Width="490"  Height="370" HorizontalAlignment="Left">
-                            </WrapPanel>
-                            <DockPanel>
-                                <Button HorizontalAlignment="Right" Margin="0 0 20 0" Width="110" Click="bt_addTools" Content="添加漂浮工具" />
-                            </DockPanel>
-                        </StackPanel>
+                        <Frame Name="seconToolsPage" NavigationUIVisibility="Hidden"/>
                     </DockPanel>
 
 

CollaborativePlatformMain/Form/HomepageForm.xaml.cs

@@ -79,44 +79,7 @@ namespace CollaborativePlatformMain.Form
             dp_tools.Visibility = Visibility.Collapsed;
             dp_threetools.Visibility = Visibility.Collapsed;
 
-
-            treeViewBinds = new List<TreeViewBind>();
-
-            treeViewBinds.Add(
-                new TreeViewBind("小学项目",
-                    new List<TreeViewBind>()
-                    {
-                        new TreeViewBind("一号楼",
-                            new List<TreeViewBind>()
-                            {
-                                new TreeViewBind("项目信息"),
-                                new TreeViewBind("团队成员"),
-                                new TreeViewBind("工作台", true),
-                                new TreeViewBind("自定义"),
-                                new TreeViewBind("+")
-                            }),
-                        new TreeViewBind("二号楼",
-                            new List<TreeViewBind>()
-                            {
-                                new TreeViewBind("项目信息"),
-                                new TreeViewBind("团队成员"),
-                                new TreeViewBind("工作台", true),
-                                new TreeViewBind("自定义"),
-                                new TreeViewBind("+")
-                            }),
-                        new TreeViewBind("三号楼",
-                            new List<TreeViewBind>()
-                            {
-                                new TreeViewBind("项目信息"),
-                                new TreeViewBind("团队成员"),
-                                new TreeViewBind("工作台", true),
-                                new TreeViewBind("自定义"),
-                                new TreeViewBind("+")
-                            })
-                    }));
-
-            tr_vw.ItemsSource = null;
-            tr_vw.ItemsSource = treeViewBinds;
+            seconProjectPage.Navigate(new SeconProjectPage());
         }
 
         /// <summary>
@@ -170,27 +133,7 @@ namespace CollaborativePlatformMain.Form
             dp_gallery.Visibility = Visibility.Collapsed;
             dp_tools.Visibility = Visibility.Visible;
             dp_threetools.Visibility = Visibility.Collapsed;
-
-
-            List<string> sLists = new List<string>() { "平台图纸治理", "块处理", "大样处理", "图纸对比", "二维审查", "三维" };
-            sp_tools.Children.Clear();
-            foreach (string s in sLists)
-            {
-                Button button = new Button();
-                button.Content = s;
-                button.BorderThickness = new Thickness(0);
-                button.Width = 180;
-                button.Height = 30;
-                button.Click += new RoutedEventHandler(toolnavigation_Click);
-                button.HorizontalContentAlignment = HorizontalAlignment.Left;
-                sp_tools.Children.Add(button);
-            }
-
-            if (ToolsForm == null)
-            {
-                ToolsForm = new ToolsForm(this, ToolLists);
-                ToolsForm.Show();
-            }
+            seconToolsPage.Navigate(new SeconToolLibraryPage());
         }
 
         /// <summary>
@@ -304,19 +247,19 @@ namespace CollaborativePlatformMain.Form
 
         private void toolnavigation_Click(object sender, RoutedEventArgs e)
         {
-            Button button = sender as Button;
+            //Button button = sender as Button;
 
-            if (button != null && ToolName_ToolDatas.ContainsKey(button.Content.ToString()))
-            {
-                ObservableCollection<CBButtonControlsData> cbButtonControls = ToolName_ToolDatas[button.Content.ToString()];
+            //if (button != null && ToolName_ToolDatas.ContainsKey(button.Content.ToString()))
+            //{
+            //    ObservableCollection<CBButtonControlsData> cbButtonControls = ToolName_ToolDatas[button.Content.ToString()];
 
-                wp_tools.Children.Clear();
+            //    wp_tools.Children.Clear();
 
-                foreach (var cbButtonControl in cbButtonControls)
-                {
-                    wp_tools.Children.Add(new CBButtonControls(cbButtonControl));
-                }
-            }
+            //    foreach (var cbButtonControl in cbButtonControls)
+            //    {
+            //        wp_tools.Children.Add(new CBButtonControls(cbButtonControl));
+            //    }
+            //}
         }
 
         /// <summary>
@@ -353,10 +296,6 @@ namespace CollaborativePlatformMain.Form
             }
         }
 
-        /// <summary>
-        /// 悬浮窗窗体
-        /// </summary>
-        public ToolsForm ToolsForm;
 
         /// <summary>
         /// 悬浮窗
@@ -593,391 +532,391 @@ namespace CollaborativePlatformMain.Form
 
         #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 = "";
+        ///// <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)
+        //{
+        //}
 
-                if (ProVersions.Contains(t3 + "版本"))
-                {
-                    int proVersionIndex = 0;
-
-                    for (int i = 0; i < 100; i++)
-                    {
-                        int j = i + 1;
+        //private void bd_Click(object sender, RoutedEventArgs e)
+        //{
+        //}
 
-                        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
 
         #endregion
 

CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml

@@ -0,0 +1,59 @@
+<Page x:Class="CollaborativePlatformMain.Form.MessageSubPage.Project.NewProjrctPage"
+        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.Project"
+        mc:Ignorable="d" Width="483" Height="430"
+        Title="NewProjrctPage" >
+
+
+    <StackPanel Name="sp_addPro"  Width="473" Margin="10 10 0 0">
+        <StackPanel x:Name="gd_top" Orientation="Horizontal">
+            <TextBlock Text="完整的项目信息有助于为您推送规范条文" Margin="0,10,10,10" />
+            <CheckBox Content="不再提醒" Click="close_Click" Margin="10" />
+        </StackPanel>
+
+        <!--项目名称-->
+        <DockPanel>
+            <Label Width="80" FontSize="13" Margin="30 0 0 0" Content="项目名称："  VerticalAlignment="Center"></Label>
+            <TextBox Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" x:Name="pro_Name" />
+        </DockPanel>
+
+        <!--项目地址-->
+        <DockPanel Margin="0 10 0 0">
+            <Label Width="80" FontSize="13" Margin="30 0 0 0" Content="项目名称："  VerticalAlignment="Center"></Label>
+            <TextBox Width="150" Height="25" HorizontalAlignment="Left" Margin="30 0 0 0" x:Name="pro_status" />
+        </DockPanel>
+
+
+        <DockPanel Margin="0,10,0,0">
+            <Label Content="设置楼栋名称" HorizontalAlignment="Left"/>
+            
+            <ItemsControl x:Name="sv_FlooName" >
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel>
+                            <TextBox Name="lb_legendName" Text="{Binding Name}" BorderThickness="0" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </DockPanel>
+
+        <DockPanel Margin="0,10,0,0">
+            <Label Content="楼栋名称：" Margin="30,0,0,0"/>
+            <TextBox Name="tb_floorName" Text="" Width="100"  />
+            <Button Content="新增" Width="100" HorizontalAlignment="Left"/>
+        </DockPanel>
+
+
+
+    </StackPanel>
+</Page>

CollaborativePlatformMain/Form/MessageSubPage/Project/NewProjrctPage.xaml.cs

@@ -0,0 +1,32 @@
+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.Project
+{
+    /// <summary>
+    /// NewProjrctPage.xaml 的交互逻辑
+    /// </summary>
+    public partial class NewProjrctPage : Page
+    {
+        public NewProjrctPage()
+        {
+            InitializeComponent();
+        }
+
+        private void close_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

CollaborativePlatformMain/Form/MessageSubPage/SeconLegendPage.xaml

@@ -20,9 +20,9 @@
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <StackPanel MouseDown="StackPanel_MouseDown">
-                            <!-- 第一行文本  项目信息 -->
+                            <!-- 第一行文本  图片 -->
                             <Image Source="{Binding ImagePath}" Width="90" Height="60"/>
-                            <!-- 第二行文本  项目业态 -->
+                            <!-- 第二行文本  文件夹名称 -->
                             <Label Name="lb_legendName" Content="{Binding Name}" BorderThickness="0" />
                         </StackPanel>
                     </DataTemplate>

CollaborativePlatformMain/Form/MessageSubPage/SeconProjectPage.xaml

@@ -0,0 +1,44 @@
+<Page x:Class="CollaborativePlatformMain.Form.MessageSubPage.SeconProjectPage"
+        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="SeconMessagePage" Width="663" Height="430"
+        Loaded="Window_Loaded">
+    <DockPanel>
+
+        <StackPanel>
+
+            <Button  Width="180" Height="25" Content="新增项目" Click="bt_addPro" HorizontalAlignment="Left" />
+            <!--中间-->
+            <TreeView x:Name="tr_vw"  Visibility="Visible" PreviewMouseLeftButtonUp="tv_projectLeftButtonUp"
+                                  Width="180" Height="405"  HorizontalAlignment="Left" Background="WhiteSmoke">
+                <TreeView.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding Children}">
+                        <TextBlock Text="{Binding Name}" />
+                    </HierarchicalDataTemplate>
+                </TreeView.ItemTemplate>
+            </TreeView>
+        </StackPanel>
+
+        <!--最右边-->
+        <StackPanel Name="sp_info" Width="483" Margin="0 10 0 0"
+                    HorizontalAlignment="Left" Visibility="Visible">
+
+            <StackPanel  >
+                <Frame Name="threeNewProject" NavigationUIVisibility="Hidden"/>
+            </StackPanel>
+
+            <StackPanel>
+                
+            </StackPanel>
+
+            <StackPanel>
+                
+            </StackPanel>
+            
+        </StackPanel>
+
+    </DockPanel>
+</Page>

CollaborativePlatformMain/Form/MessageSubPage/SeconProjectPage.xaml.cs

@@ -0,0 +1,43 @@
+using CollaborativePlatformMain.Form.MessageSubPage.Project;
+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>
+    /// SeconProjectPage.xaml 的交互逻辑
+    /// </summary>
+    public partial class SeconProjectPage : Page
+    {
+        public SeconProjectPage()
+        {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            threeNewProject.Navigate(new NewProjrctPage());
+        }
+
+        private void tv_projectLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+
+        private void bt_addPro(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

CollaborativePlatformMain/Form/MessageSubPage/SeconThreeDimensionalPage.xaml

@@ -12,7 +12,7 @@
 
         <!--中间-->
         <StackPanel Height="430">
-            <StackPanel Width="180" Height="430" Background="WhiteSmoke"  Name="sp_three">
+            <StackPanel Width="130" Height="430" Background="WhiteSmoke"  Name="sp_three">
 
                 <TreeView x:Name="tr_threemodel" PreviewMouseLeftButtonUp="tr_threemodel_PreviewMouseLeftButtonUp"
                                   Width="180"  Height="430" HorizontalAlignment="Left" Background="WhiteSmoke">

CollaborativePlatformMain/Form/MessageSubPage/SeconToolLibraryPage.xaml

@@ -5,22 +5,55 @@
         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"
+        Title="SeconContactsPage" Width="663" Height="420"
         Loaded="Window_Loaded">
 
-    <StackPanel>
-        <StackPanel Name="sp_tools" Width="180" HorizontalAlignment="Left" Background="WhiteSmoke">
+    <DockPanel>
+        <StackPanel Name="sp_tools" Width="100" HorizontalAlignment="Left" Background="WhiteSmoke">
+
+            <Button Name="bt_bock" Content="块处理" Width="180" Height="30" Click="bt_bock_Click"/>
+            <Button Name="bt_Comparison" Content="图纸对比" Width="180" Height="30" Click="bt_Comparison_Click"/>
+            <Button Name="bt_twoReview" Content="二维审查" Width="180" Height="30" Click="bt_twoReview_Click"/>
+            <Button Name="bt_text" Content="文字处理" Width="180" Height="30" Click="bt_text_Click"/>
+
         </StackPanel>
 
         <!--最右边-->
-        <StackPanel Height="420"  VerticalAlignment="Top" Width="483"
-                                Margin="0 10 0 0"  HorizontalAlignment="Left">
+        <StackPanel Height="420"  VerticalAlignment="Top" Width="563"
+                                Margin="0 0 0 0"  HorizontalAlignment="Left">
+
+            <StackPanel Height="390">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="0,0,0,20">
+                    <ItemsControl x:Name="sv_legend" >
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel MouseDown="StackPanel_MouseDown" Margin="10,0,0,0">
+                                    <StackPanel Margin="5" Height="32" Width="32" Background="Aquamarine">
+                                    </StackPanel>
+
+                                    <TextBlock Name="tb_name" Text="{Binding FuncitonName}" HorizontalAlignment="Center" />
+                                    <CheckBox  Name="cb_check" IsChecked="{Binding IsCheck}" Margin="0 5 0 0" HorizontalAlignment="Center" />
+
+                                    <!--<Image Source="{Binding ImagePath}" Width="90" Height="60" HorizontalAlignment="Center"/>--><!--
+                                    <StackPanel Width="20" Height="20" Background="{DynamicResource Blue}"/>
+                                    <Label Name="lb_legendName" Content="{Binding FuncitonName}" BorderThickness="0" HorizontalAlignment="Center"/>
+                                    <CheckBox IsChecked="{Binding IsCheck}" Margin="20,0,0,0" HorizontalAlignment="Center"/>-->
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </StackPanel>
 
-            <WrapPanel Name="wp_tools" Margin="0 0 0 0" Width="490"  Height="370" HorizontalAlignment="Left">
-            </WrapPanel>
-            <DockPanel>
+            <DockPanel VerticalAlignment="Bottom">
                 <Button HorizontalAlignment="Right" Margin="0 0 20 0" Width="110" Click="bt_addTools" Content="添加漂浮工具" />
             </DockPanel>
         </StackPanel>
-    </StackPanel>
+    </DockPanel>
 </Page>

CollaborativePlatformMain/Form/MessageSubPage/SeconToolLibraryPage.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using CollaborativePlatformMain.DFEntity.MessageSubUtil;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -19,18 +20,143 @@ namespace CollaborativePlatformMain.Form.MessageSubPage
     /// </summary>
     public partial class SeconToolLibraryPage : Page
     {
+        /// <summary>
+        /// 块子功能
+        /// </summary>
+        public List<ToolFunctionEntity> BlockDatas = new List<ToolFunctionEntity>();
+
+        /// <summary>
+        /// 对比子功能
+        /// </summary>
+        public List<ToolFunctionEntity> ContrastDatas = new List<ToolFunctionEntity>();
+
+        /// <summary>
+        /// 二维子功能
+        /// </summary>
+        public List<ToolFunctionEntity> TwoDimDatas = new List<ToolFunctionEntity>();
+
+        /// <summary>
+        /// 文字子功能
+        /// </summary>
+        public List<ToolFunctionEntity> TextDatas = new List<ToolFunctionEntity>();
+
+
         public SeconToolLibraryPage()
         {
             InitializeComponent();
         }
 
+        /// <summary>
+        /// 窗体初始化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            ToolFunctionEntity toolFunctionEntity1 = new ToolFunctionEntity("快速建块", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity2 = new ToolFunctionEntity("块分解", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity3 = new ToolFunctionEntity("块基点更改", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity4 = new ToolFunctionEntity("修改块颜色", @"/Image/folderImage.png", false);
+            BlockDatas = new List<ToolFunctionEntity>() { toolFunctionEntity1, toolFunctionEntity2, toolFunctionEntity3, toolFunctionEntity4 };
+
+            ToolFunctionEntity toolFunctionEntity5 = new ToolFunctionEntity("图纸对比", @"/Image/folderImage.png", false);
+            ContrastDatas = new List<ToolFunctionEntity>() { toolFunctionEntity5 };
+
+            ToolFunctionEntity toolFunctionEntity6 = new ToolFunctionEntity("二维审查", @"/Image/folderImage.png", false);
+            TwoDimDatas = new List<ToolFunctionEntity>() { toolFunctionEntity6 };
+
+
+            ToolFunctionEntity toolFunctionEntity7 = new ToolFunctionEntity("文字替换", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity8 = new ToolFunctionEntity("文字搜索", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity9 = new ToolFunctionEntity("文字合并", @"/Image/folderImage.png", false);
+            ToolFunctionEntity toolFunctionEntity10 = new ToolFunctionEntity("文字样式补充", @"/Image/folderImage.png", false);
+            TextDatas = new List<ToolFunctionEntity>() { toolFunctionEntity7, toolFunctionEntity8, toolFunctionEntity9, toolFunctionEntity10 };
+        }
+
+        /// <summary>
+        /// 块处理
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void bt_bock_Click(object sender, RoutedEventArgs e)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = BlockDatas;
+        }
 
+        /// <summary>
+        /// 图纸对比
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void bt_Comparison_Click(object sender, RoutedEventArgs e)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = ContrastDatas;
         }
 
+        /// <summary>
+        /// 二维审查
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void bt_twoReview_Click(object sender, RoutedEventArgs e)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = TwoDimDatas;
+        }
+
+        /// <summary>
+        /// 文字处理
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void bt_text_Click(object sender, RoutedEventArgs e)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = TextDatas;
+        }
+
+
+        public SuspensionForm BaseForm = null;
+
+        /// <summary>
+        /// 添加漂浮工具
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void bt_addTools(object sender, RoutedEventArgs e)
         {
+            List<ToolFunctionEntity> allToolEntitys = new List<ToolFunctionEntity>();
+            allToolEntitys.AddRange(BlockDatas.Where(x => x.IsCheck));
+            allToolEntitys.AddRange(ContrastDatas.Where(x => x.IsCheck));
+            allToolEntitys.AddRange(TwoDimDatas.Where(x => x.IsCheck));
+            allToolEntitys.AddRange(TextDatas.Where(x => x.IsCheck));
+
+
+            if (BaseForm != null)
+            {
+                BaseForm.SetToolEntity(allToolEntitys);
+            }
+            else
+            {
+                BaseForm = new SuspensionForm(this, allToolEntitys);
+                BaseForm.Show();
+            }
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void CheckBox_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
 
         }
     }

CollaborativePlatformMain/Form/MessageSubPage/SuspensionForm.xaml

@@ -0,0 +1,37 @@
+<Window x:Class="CollaborativePlatformMain.Form.MessageSubPage.SuspensionForm"
+        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="工具栏"  WindowStartupLocation="CenterScreen"
+        SizeToContent="WidthAndHeight"  ResizeMode="NoResize" Loaded="Window_Loaded"
+        Closed="Window_Closed">
+
+    <StackPanel>
+
+        <!--<StackPanel Background="{DynamicResource Blue}">
+            <Label Content="工具栏" BorderThickness="0" Foreground="White"  Background="{DynamicResource Blue}" HorizontalAlignment="Left"/>
+        </StackPanel>-->
+
+        <StackPanel Height="500" Width="100">
+            <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="0,0,0,20">
+                <ItemsControl x:Name="sv_legend" >
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel/>
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <DockPanel MouseDown="DockPanel_MouseDown" Margin="0,10,0,0">
+                                <Label Name="lb_legendName" Content="{Binding FuncitonName}" Width="110" Background="WhiteSmoke" BorderThickness="0" HorizontalAlignment="Center"/>
+                            </DockPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </StackPanel>
+    </StackPanel>
+</Window>

CollaborativePlatformMain/Form/MessageSubPage/SuspensionForm.xaml.cs

@@ -0,0 +1,85 @@
+using CollaborativePlatformMain.DFEntity.MessageSubUtil;
+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>
+    /// SuspensionForm.xaml 的交互逻辑
+    /// </summary>
+    public partial class SuspensionForm : Window
+    {
+        /// <summary>
+        /// 父级窗体
+        /// </summary>
+        public SeconToolLibraryPage SeconToolLibraryPage;
+
+        /// <summary>
+        /// 工具数据
+        /// </summary>
+        public List<ToolFunctionEntity> ToolFunctionEntities = new List<ToolFunctionEntity>();
+
+        /// <summary>
+        /// 工具栏悬浮窗
+        /// </summary>
+        /// <param name="toolFunctionEntities"></param>
+        public SuspensionForm(SeconToolLibraryPage seconToolLibraryPage, List<ToolFunctionEntity> toolFunctionEntities)
+        {
+            InitializeComponent();
+            SeconToolLibraryPage = seconToolLibraryPage;
+            ToolFunctionEntities = toolFunctionEntities;
+        }
+
+        /// <summary>
+        /// 窗体初始化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = ToolFunctionEntities;
+        }
+
+        /// <summary>
+        /// 点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DockPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="toolFunctionEntities"></param>
+        public void SetToolEntity(List<ToolFunctionEntity> toolFunctionEntities)
+        {
+            sv_legend.ItemsSource = null;
+            sv_legend.ItemsSource = toolFunctionEntities;
+        }
+
+        /// <summary>
+        /// 窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            SeconToolLibraryPage.BaseForm = null;
+        }
+    }
+}

CollaborativePlatformMain/Form/ToolsForm.xaml

@@ -1,64 +0,0 @@
-<Window x:Class="CollaborativePlatformMain.Form.ToolsForm"
-        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"
-         xmlns:HandyControl="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-        xmlns:LayUI="clr-namespace:LayUI.Wpf.Controls;assembly=LayUI.Wpf"
-        mc:Ignorable="d"
-        AllowsTransparency="True"
-        Background=" Transparent"
-        WindowStartupLocation="CenterScreen"
-        WindowStyle="None"
-        Title="" SizeToContent="WidthAndHeight" ResizeMode="NoResize" Closed="ToolsForm_OnClosed">
-    <LayUI:LayTitleBar Background="{DynamicResource Blue}"   CornerRadius="10"
-                       WindowState="{Binding WindowState, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-        <LayUI:LayTitleBar.Header>
-            <Border Height="35">
-                <DockPanel>
-                    <TextBlock Margin="10,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
-                               Text="功能工具" />
-                </DockPanel>
-            </Border>
-        </LayUI:LayTitleBar.Header>
-
-        <Border  CornerRadius="0 0 10 10" Background="White">
-
-            <StackPanel Width="250" Height="400" Margin="0 0 0 10">
-                <ListView HorizontalAlignment="Left" Background="White" BorderThickness="0"
-                      VerticalAlignment="Top" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                      ScrollViewer.VerticalScrollBarVisibility="Hidden" Width="250"
-                      x:Name="lv_projectInfo"  Height="400" Visibility="Visible" d:ItemsSource="{d:SampleData ItemCount=5}">
-
-                    <!--隐藏列头-->
-                    <ListView.Resources>
-                        <Style TargetType="{x:Type GridViewColumnHeader}">
-                            <Setter Property="Visibility" Value="Collapsed" />
-                        </Style>
-                    </ListView.Resources>
-
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="Height" Value="35" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-
-                    <ListView.View>
-                        <GridView  x:Name="gridview">
-                            <GridViewColumn  Width="190" x:Name="Column1">
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock  HorizontalAlignment="Left" Height="20" TextWrapping="Wrap"
-                                                Text="{Binding BtnName}"
-                                                VerticalAlignment="Center" />
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                        </GridView>
-                    </ListView.View>
-                </ListView>
-            </StackPanel>
-        </Border>
-    </LayUI:LayTitleBar>
-</Window>

CollaborativePlatformMain/Form/ToolsForm.xaml.cs

@@ -1,40 +0,0 @@
-using CollaborativePlatformMain.Form.UserControlForm;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-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
-{
-    /// <summary>
-    /// ToolsForm.xaml 的交互逻辑
-    /// </summary>
-    public partial class ToolsForm : Window
-    {
-        private HomepageForm HomepageForm;
-
-        public ToolsForm(HomepageForm homepageForm, ObservableCollection<CBButtonControlsData> entities)
-        {
-            InitializeComponent();
-
-            lv_projectInfo.ItemsSource = null;
-            lv_projectInfo.ItemsSource = entities;
-            HomepageForm = homepageForm;
-        }
-
-        private void ToolsForm_OnClosed(object sender, EventArgs e)
-        {
-            HomepageForm.ToolsForm = null;
-        }
-    }
-}