瀏覽代碼

xls:拓扑地址捕获修改

xulisong 6 年之前
父節點
當前提交
16e64e0c4f
共有 37 個文件被更改,包括 442 次插入70 次删除
  1. 1 1
      MBI/CEFSharpWPF/SgRequestHandle.cs
  2. 3 0
      MBI/CEFSharpWPF/UcGplotShow.xaml.cs
  3. 13 2
      MBI/FirmLib/Com.FirmLib.UI/BllCommon/BaseAssetItem.cs
  4. 1 1
      MBI/FirmLib/Com.FirmLib.UI/BllCommon/EquipmentFamilyManager.cs
  5. 17 4
      MBI/FirmLib/Com.FirmLib.UI/BllCommon/ProductTypeManager.cs
  6. 2 2
      MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerAssetSelector.xaml
  7. 4 4
      MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerProjectInfo.xaml
  8. 3 3
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinAddProductType.xaml
  9. 2 2
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerAssetSelector.xaml
  10. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerInfo.xaml
  11. 2 2
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerProjectAsset.xaml
  12. 3 3
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinManitainerProjectInfo.xaml
  13. 3 3
      MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinUpdateProductType.xaml
  14. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductList.xaml
  15. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml
  16. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProjectAssetList.xaml
  17. 2 2
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinMultiProductTypeSelector.xaml
  18. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerBaseInfo.xaml
  19. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerInfo.xaml
  20. 4 4
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectContract.xaml
  21. 5 5
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectInfo.xaml
  22. 1 1
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSupplyAssetCreater.xaml
  23. 2 2
      MBI/FirmLib/Com.FirmLib.UI/Seller/WinSupplyAssetSelector.xaml
  24. 6 0
      MBI/FirmLib/Com.FirmLib/Entity/InsuerItem.cs
  25. 16 5
      MBI/SAGA.GplotManage/GplotCommand.cs
  26. 11 3
      MBI/SAGA.GplotManage/RelatedDataUpload.cs
  27. 2 1
      MBI/SAGA.GplotManage/UploadRelated/ConvectionNetwork.cs
  28. 1 1
      MBI/SAGA.GplotManage/UploadRelated/Gplot.cs
  29. 2 1
      MBI/SAGA.GplotManage/UploadRelated/RadiationNetwork.cs
  30. 3 2
      MBI/SAGA.GplotManage/UploadRelated/TrafficNetwork.cs
  31. 2 2
      MBI/SAGA.MBI/Command.cs
  32. 2 0
      MBI/SAGA.MBI/SAGA.MBI.csproj
  33. 97 0
      MBI/SAGA.MBI/WinView/Space/SpaceFailuresPreprocessor.cs
  34. 193 0
      MBI/SAGA.MBI/WinView/Space/SpaceManager.cs
  35. 0 8
      MBI/SAGA.MBI/WinView/Space/WinSelectSpace.xaml.cs
  36. 32 0
      MBI/SAGA.RevitUtils/MBIExtension/MBIDocExtension.cs
  37. 1 0
      MBI/SAGA.RevitUtils/SAGA.RevitUtils.csproj

+ 1 - 1
MBI/CEFSharpWPF/SgRequestHandle.cs

@@ -40,7 +40,7 @@ namespace CEFSharpWPF
         {
             if (response.MimeType.ToLower().IndexOf("text") > -1 || response.MimeType.ToLower().IndexOf("json") > -1)
             {
-                if (request.Url.IndexOf("/physics/data-platform-3/fast/object/in_query") > -1)
+                if (request.Url.IndexOf("infocode/business_space_type/query") > -1)
                 {
                    var filter = new ModifyResponseFilter();
 

+ 3 - 0
MBI/CEFSharpWPF/UcGplotShow.xaml.cs

@@ -19,10 +19,13 @@ namespace CEFSharpWPF
     public partial class UcGplotShow : UserControl
     {
         public string URL { get; set; } = "http://172.16.0.181:8888/#/demo";
+
         public UcGplotShow()
         {
             OneTimeLoad.Init();
             InitializeComponent();
+            this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Copy,
+                (s, e) => { Clipboard.SetDataObject(URL ?? string.Empty, false); }));
             this.Loaded += UcGplotShow_Loaded;
         }
 

+ 13 - 2
MBI/FirmLib/Com.FirmLib.UI/BllCommon/BaseAssetItem.cs

@@ -87,7 +87,15 @@ namespace Com.FirmLib.UI
         /// </summary>
         public string Product
         {
-            get { return this.m_Product; }
+            get
+            {
+                if (!string.IsNullOrWhiteSpace(TypeId) && string.IsNullOrWhiteSpace(this.m_Product))
+                {
+                    m_Product = ProductTypeManager.GetProductName(TypeId);
+                }
+
+                return this.m_Product;
+            }
             set
             {
                 this.m_Product = value;
@@ -102,7 +110,10 @@ namespace Com.FirmLib.UI
         /// </summary>
         public string Type
         {
-            get { return this.m_Type; }
+            get
+            {              
+                return this.m_Type;
+            }
             set
             {
                 this.m_Type = value;

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/BllCommon/EquipmentFamilyManager.cs

@@ -24,7 +24,7 @@ namespace Com.FirmLib.UI.BllCommon
         /// <returns></returns>
         public static List<EquipmentFamilyItem> GetFamilys()
         {
-           return  MemoryCacheUtil.GetCacheItem<List<EquipmentFamilyItem>>("EquipmentFamily", () => BllFactory<EquipmentFamilyBll>.Instance.GetAllItems(), new TimeSpan(10 * 1800))??new List<EquipmentFamilyItem>();
+           return  MemoryCacheUtil.GetCacheItem<List<EquipmentFamilyItem>>("EquipmentFamily", () => BllFactory<EquipmentFamilyBll>.Instance.GetAllItems(), new TimeSpan(0,0,1800))??new List<EquipmentFamilyItem>();
         }
         /// <summary>
         /// 获取设备族中叶子级节点

+ 17 - 4
MBI/FirmLib/Com.FirmLib.UI/BllCommon/ProductTypeManager.cs

@@ -214,19 +214,32 @@ namespace Com.FirmLib.UI
         /// 获取产品信息
         /// </summary>
         /// <returns></returns>
-        public static List<ProductTypeDetailItem> GetProductTypes()
+        public static  Dictionary<string, ProductTypeDetailItem> GetProductTypes()
         {
-            return MemoryCacheUtil.GetCacheItem<List<ProductTypeDetailItem>>("ProdcutTypes",()=> ProductTypeManager.ConverToList(BllFactory<GeneralBll>.Instance.GetProductTypeItems()), new TimeSpan(1800)) ?? new List<ProductTypeDetailItem>();
+            return MemoryCacheUtil.GetCacheItem<Dictionary<string,ProductTypeDetailItem>>("ProdcutTypes",()=>
+            {
+                Dictionary<string, ProductTypeDetailItem> dic = new Dictionary<string, ProductTypeDetailItem>();
+                var items = ProductTypeManager.ConverToList(BllFactory<GeneralBll>.Instance
+                               .GetProductTypeItems());
+                foreach (var productTypeDetailItem in items)
+                {
+                    dic[productTypeDetailItem.ProductTypeId] = productTypeDetailItem;
+                }
+                return dic;
+            }, new TimeSpan(0,0,300)) ?? new Dictionary<string, ProductTypeDetailItem>();
         }
         /// <summary>
-        /// 获取类型的产品名
+        /// 获取类型的产品名[暂时不用字典存储]
         /// </summary>
         /// <param name="productTypeId"></param>
         /// <returns></returns>
         public static string GetProductName(string productTypeId)
         {
             var items = GetProductTypes();
-            return items.FirstOrDefault(p => p.ProductTypeId == productTypeId)?.ProductName;
+            items.TryGetValue(productTypeId, out ProductTypeDetailItem item);
+            if (item != null)
+                return item.ProductName;
+            return string.Empty;
         }
         #endregion
     }

+ 2 - 2
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerAssetSelector.xaml

@@ -36,7 +36,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -114,7 +114,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 4 - 4
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerProjectInfo.xaml

@@ -81,7 +81,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
 
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
@@ -126,7 +126,7 @@
                                 <fw:TDataGridTextColumn Header="产品名"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Product}"></fw:TDataGridTextColumn>
 
                                 <fw:TDataGridTextColumn Header="型号"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
-                                <DataGridTemplateColumn Header="保险单号" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                                <DataGridTemplateColumn Header="保险单号" SortMemberPath="InsurancePolicyNo" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=InsurancePolicyNo,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" fw:ElementCopyOptions.CopyHandle="{StaticResource ResourceKey=CopyHandle}">
@@ -154,7 +154,7 @@
 
                                 <fw:TDataGridTextColumn Header="保险截止日期"  Width="80" IsReadOnly="True"  Binding="{Binding Path=EndDate}"></fw:TDataGridTextColumn>
 
-                                <DataGridTemplateColumn Header="保险文件"  Width="60" IsReadOnly="True" >
+                                <DataGridTemplateColumn Header="保险文件" Width="60" IsReadOnly="True" >
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <ContentControl Content="{Binding}">
@@ -193,7 +193,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 3 - 3
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinAddProductType.xaml

@@ -46,7 +46,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>
@@ -62,7 +62,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>
@@ -83,7 +83,7 @@
                       HorizontalScrollBarVisibility="Auto"
                       SelectionUnit="FullRow"
                       HeadersVisibility="Column" 
-                      CanUserSortColumns="False"   
+                      CanUserSortColumns="True"   
                       CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2">
                     <DataGrid.Columns>

+ 2 - 2
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerAssetSelector.xaml

@@ -38,7 +38,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -116,7 +116,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerInfo.xaml

@@ -107,7 +107,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"  
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 2 - 2
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerProjectAsset.xaml

@@ -77,7 +77,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -117,7 +117,7 @@
                         <fw:TDataGridTextColumn Header="品牌"  Width="100" IsReadOnly="True"  Binding="{Binding Path=Brand}"></fw:TDataGridTextColumn>
                         <fw:TDataGridTextColumn Header="产品名"  Width="100" IsReadOnly="True"  Binding="{Binding Path=Product}"></fw:TDataGridTextColumn>
                         <fw:TDataGridTextColumn Header="型号"  Width="100" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
-                        <DataGridTemplateColumn Header="保养周期" Width="100" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="保养周期" Width="100" SortMemberPath="MaintainPeriod" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=MaintainPeriod,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">

+ 3 - 3
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinManitainerProjectInfo.xaml

@@ -127,7 +127,7 @@
                                 <fw:TDataGridTextColumn Header="产品名"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Product}"></fw:TDataGridTextColumn>
 
                                 <fw:TDataGridTextColumn Header="型号"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
-                                <DataGridTemplateColumn Header="合同截止日期" Width="120" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                                <DataGridTemplateColumn Header="合同截止日期" Width="120" SortMemberPath="MaintainerEndDate" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=MaintainerEndDate,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -142,7 +142,7 @@
                                             </DataTemplate>
                                        </DataGridTemplateColumn.CellEditingTemplate>
                                 </DataGridTemplateColumn>
-                                 <DataGridTemplateColumn Header="保养周期" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                                 <DataGridTemplateColumn Header="保养周期" Width="80" SortMemberPath="MaintainPeriod" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                             <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=MaintainPeriod,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -225,7 +225,7 @@
 
                             <fw:TDataGridTextColumn Header="型号"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
 
-                            <DataGridTemplateColumn Header="合同截止日期" Width="120"  fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                            <DataGridTemplateColumn Header="合同截止日期" Width="120"  SortMemberPath="MaintainerEndDate" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=MaintainerEndDate,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">

+ 3 - 3
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinUpdateProductType.xaml

@@ -96,7 +96,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>
@@ -112,7 +112,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>
@@ -133,7 +133,7 @@
                       HorizontalScrollBarVisibility="Auto"
                       SelectionUnit="FullRow"
                       HeadersVisibility="Column" 
-                      CanUserSortColumns="False"   
+                      CanUserSortColumns="True"   
                       CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2">
                     <DataGrid.Columns>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductList.xaml

@@ -60,7 +60,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml

@@ -41,7 +41,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   SelectedItem="{Binding CurrentTypeItem,Mode=OneWay}"
                   

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProjectAssetList.xaml

@@ -26,7 +26,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 2 - 2
MBI/FirmLib/Com.FirmLib.UI/Seller/WinMultiProductTypeSelector.xaml

@@ -41,7 +41,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="False"   
+                  CanUserSortColumns="True"   
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
             <DataGrid.Columns>
@@ -78,7 +78,7 @@
                       HorizontalScrollBarVisibility="Auto"
                       SelectionUnit="FullRow"
                       HeadersVisibility="Column" 
-                      CanUserSortColumns="False"   
+                      CanUserSortColumns="True"   
                       CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2">
                 <DataGrid.Columns>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerBaseInfo.xaml

@@ -31,7 +31,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerInfo.xaml

@@ -132,7 +132,7 @@
                 IsReadOnly="True"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
 
                   AlternationCount="2"
                 >

+ 4 - 4
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectContract.xaml

@@ -89,7 +89,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -131,7 +131,7 @@
                         <fw:TDataGridTextColumn Header="产品名"  Width="100" IsReadOnly="True"  Binding="{Binding Path=Product}"></fw:TDataGridTextColumn>
                         <fw:TDataGridTextColumn Header="型号"  Width="100" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
 
-                        <DataGridTemplateColumn Header="采购价格" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="采购价格" Width="80" SortMemberPath="ProcurementPrice" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=ProcurementPrice,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -155,7 +155,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellEditingTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Header="保修期" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="保修期" Width="80" SortMemberPath="Warranty" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=Warranty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -179,7 +179,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellEditingTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Header="生产日期" Width="120" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="生产日期" Width="120" SortMemberPath="ProductionDate" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=ProductionDate,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">

+ 5 - 5
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectInfo.xaml

@@ -62,7 +62,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -107,7 +107,7 @@
 
                         <fw:TDataGridTextColumn Header="型号"  Width="80" IsReadOnly="True"  Binding="{Binding Path=Type}"></fw:TDataGridTextColumn>
                       
-                        <DataGridTemplateColumn Header="采购价格" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="采购价格" SortMemberPath="ProcurementPrice" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=ProcurementPrice,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -131,7 +131,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellEditingTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Header="保修期" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="保修期" SortMemberPath="Warranty" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border  fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=Warranty,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -155,7 +155,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellEditingTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Header="生产日期" Width="120"  fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="生产日期" SortMemberPath="ProductionDate" Width="120"  fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=ProductionDate,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">
@@ -172,7 +172,7 @@
                         </DataGridTemplateColumn>
                         <fw:TDataGridTextColumn Header="出厂编号"  Width="80" IsReadOnly="True"  Binding="{Binding Path=ManufacturingNo}"></fw:TDataGridTextColumn>
                     
-                        <DataGridTemplateColumn Header="所属供应合同编号" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
+                        <DataGridTemplateColumn Header="所属供应合同编号" SortMemberPath="SellerContractNo" Width="80" fw:DataGridDragCopyOptions.CanColumnDragCopy="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Border fw:ElementCopyOptions.UseCopy="True" fw:ElementCopyOptions.CopyValue="{Binding Path=SellerContractNo,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}">

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSupplyAssetCreater.xaml

@@ -97,7 +97,7 @@
                       HorizontalScrollBarVisibility="Auto"
                       SelectionUnit="FullRow"
                       HeadersVisibility="Column" 
-                      CanUserSortColumns="False"   
+                      CanUserSortColumns="True"   
                       CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2">
                 <DataGrid.Columns>

+ 2 - 2
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSupplyAssetSelector.xaml

@@ -38,7 +38,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >
@@ -116,7 +116,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="False"   
+                CanUserSortColumns="True"   
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                                
                   AlternationCount="2"

+ 6 - 0
MBI/FirmLib/Com.FirmLib/Entity/InsuerItem.cs

@@ -120,6 +120,12 @@ namespace Com.FirmLib.Entity
         [JsonProperty("InsuranceFile")]
         public string InsuranceFile { get; set; }
 
+        /// <summary>
+        ///  型号Id
+        /// </summary>
+        [JsonProperty("DPSpecificationID")]
+        public string SpecificationId { get; set; }
+
     }
 
     /// <summary>

+ 16 - 5
MBI/SAGA.GplotManage/GplotCommand.cs

@@ -1,4 +1,5 @@
-using System.Threading;
+using System.Collections.Generic;
+using System.Threading;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
@@ -119,10 +120,20 @@ namespace SAGA.GplotManage
     {
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
-            var graph = new ChillWaterLoop();
-           // var graph=new ElementSpNeighborhood();
-            graph.Relationship = graph.ComputerEffectRelationShip;
-            graph.Upload();
+            //var graph = new ChillWaterLoop();
+            List<Gplot> gplots = new List<Gplot>();
+            gplots.Add(new ElementSpNeighborhood());
+            gplots.Add(new TrafficNetwork());
+            gplots.Add(new ConvectionNetwork());
+            gplots.Add(new RadiationNetwork());
+            foreach (var gplot in gplots)
+            {
+                var graph =gplot;//new ElementSpNeighborhood();
+                graph.Relationship = graph.ComputerEffectRelationShip;
+                graph.Upload();
+
+            }
+           
             return Result.Succeeded;
         }
 

+ 11 - 3
MBI/SAGA.GplotManage/RelatedDataUpload.cs

@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using SAGA.DotNetUtils.Http;
 using SAGA.DotNetUtils.Logger;
 using SAGA.MBI.Common;
@@ -112,13 +113,20 @@ namespace SAGA.GplotManage
                 }
             }
             if (criteria.criterias.Count == 0) return false;
-
+               listCriterias.AddRange(criteria.criterias);
+              var result = true;
+             string postData2 = JsonConvert.SerializeObject(listCriterias);
+            JObject jobject = new JObject();
+            jobject.Add("criterias", JArray.FromObject(listCriterias));
+            RestClient restClient1 = new RestClient(url, HttpVerb.POST, JsonConvert.SerializeObject(jobject).ToString());
+            result = result && restClient1.GetRequest().IsSuccess();
+            return result;
             #region 分批上传拓扑数据
 
-            listCriterias.AddRange(criteria.criterias);
+         
             int count = 250;
             int index = listCriterias.Count / count;
-            var result = true;
+         
             ThreadPool.SetMaxThreads(5, 5);
           
             for (int i = 0; i <= index; i++)

+ 2 - 1
MBI/SAGA.GplotManage/UploadRelated/ConvectionNetwork.cs

@@ -33,7 +33,8 @@ namespace SAGA.GplotManage.UploadRelated
                     space.AdjacentSpaces.AddRange(space.UpElements);
                     foreach (var adjacentSpace in space.AdjacentSpaces)
                     {
-                        GetReleateData(space.Id, adjacentSpace.Space.Id);
+                        var data = GetReleateData(space.Id, adjacentSpace.Space.Id);
+                        this.Criterias.criterias.Add(data);
                     }
                 }
             }

+ 1 - 1
MBI/SAGA.GplotManage/UploadRelated/Gplot.cs

@@ -88,7 +88,7 @@ namespace SAGA.GplotManage.UploadRelated
             {
                 DealUploadData();
                 TableToExcel(Criterias.criterias, @"D:\\uploadGraphData.xlsx");
-                return;
+               // return;
                 var str = ConvertJsonString(Criterias);
                 //   Log4Net.Debug(str);
                 bool result = RelatedDataUpload.CreateRelation(Criterias);

+ 2 - 1
MBI/SAGA.GplotManage/UploadRelated/RadiationNetwork.cs

@@ -33,7 +33,8 @@ namespace SAGA.GplotManage.UploadRelated
                     space.AdjacentSpaces.AddRange(space.UpElements);
                     foreach (var adjacentSpace in space.AdjacentSpaces)
                     {
-                        GetReleateData(space.Id, adjacentSpace.Space.Id);
+                        var data = GetReleateData(space.Id, adjacentSpace.Space.Id);
+                        this.Criterias.criterias.Add(data);
                     }
                 }
             }

+ 3 - 2
MBI/SAGA.GplotManage/UploadRelated/TrafficNetwork.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace SAGA.GplotManage.UploadRelated
 {
-    class TrafficNetwork : SpaceRelated
+    public class TrafficNetwork : SpaceRelated
     {
         public override GraphTypeEnum GraphType => GraphTypeEnum.TrafficNetwork;
 
@@ -33,7 +33,8 @@ namespace SAGA.GplotManage.UploadRelated
                     space.AdjacentSpaces.AddRange(space.UpElements);
                     foreach (var adjacentSpace in space.AdjacentSpaces)
                     {
-                        GetReleateData(space.Id, adjacentSpace.Space.Id);
+                        var data=GetReleateData(space.Id, adjacentSpace.Space.Id);
+                          this.Criterias.criterias.Add(data);
                     }
                 }
             }

+ 2 - 2
MBI/SAGA.MBI/Command.cs

@@ -585,7 +585,7 @@ namespace SAGA.MBI
             IList<FailureMessageAccessor> listFma = failuresAccessor.GetFailureMessages();
             if (listFma.Count == 0)
                 return FailureProcessingResult.Continue;
-            foreach (FailureMessageAccessor fma in listFma)
+            foreach (FailureMessageAccessor  fma in listFma)
             {
                 if (fma.GetSeverity() == FailureSeverity.Error)
                 {
@@ -655,7 +655,7 @@ namespace SAGA.MBI
             return Result.Succeeded;
         }
 
-        public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)
+        public override bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)
         {
             return false;
         }

+ 2 - 0
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -623,6 +623,8 @@
     <Compile Include="DataArrange\DalUploadFloor.cs" />
     <Compile Include="WinView\Space\GeometryHelper.cs" />
     <Compile Include="WinView\Space\ServerSpace.cs" />
+    <Compile Include="WinView\Space\SpaceFailuresPreprocessor.cs" />
+    <Compile Include="WinView\Space\SpaceManager.cs" />
     <Compile Include="WinView\Space\WinConfirm.xaml.cs">
       <DependentUpon>WinConfirm.xaml</DependentUpon>
     </Compile>

+ 97 - 0
MBI/SAGA.MBI/WinView/Space/SpaceFailuresPreprocessor.cs

@@ -0,0 +1,97 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:SpaceFailuresPreprocessor
+ * 作者:xulisong
+ * 创建时间: 2018/12/14 11:11:04
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using Autodesk.Revit.DB;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SAGA.MBI.WinView.Space
+{
+    /// <summary>
+    /// 错误集合
+    /// </summary>
+    public class FailItem: List<ElementId>
+    {
+        public FailItem()
+        {
+        }
+
+        public FailItem(List<ElementId> ids) : base(ids)
+        {
+        }
+    }
+   /// <summary>
+   /// 空间错误机制
+   /// </summary>
+    public class SpaceFailuresPreprocessor: IFailuresPreprocessor
+    {
+        /*
+         * 创建警告时,如果一个区域已经存在多个空间,创建警告时会把所有警告空间进行捕获
+         */
+
+        #region 构造函数
+        public SpaceFailuresPreprocessor()
+        {
+            Items = new List<FailItem>();
+        }
+        public SpaceFailuresPreprocessor(bool append):this()
+        {
+            Append = append;
+        }
+        #endregion
+        #region 相关操纵选项
+        /// <summary>
+        /// 是否追加捕获信息
+        /// </summary>
+        private bool Append { get; set; }
+        public void SetOperate(bool continueAdd)
+        {
+            Append = continueAdd;
+        } 
+
+        public List<FailItem> Items { get; private set; }
+        #endregion
+
+        public FailureProcessingResult PreprocessFailures(FailuresAccessor failuresAccessor)
+        {
+            IList<FailureMessageAccessor> messages = failuresAccessor.GetFailureMessages();
+            if (messages.Count == 0)
+                return FailureProcessingResult.Continue;
+            foreach (FailureMessageAccessor message in messages)
+            {
+                var currentSeverity = message.GetSeverity();
+                switch (currentSeverity)
+                {
+                    case FailureSeverity.Error:
+                    {
+                            if (message.HasResolutions())
+                                failuresAccessor.ResolveFailure(message);
+                            break;
+                    }
+                    case FailureSeverity.Warning:
+                    {
+                        if (Append)
+                        {
+                             var elementIds = message.GetFailingElementIds();
+                            if (elementIds.Any())
+                            {
+                                  Items.Add(new FailItem(elementIds.ToList()));
+                            }                        
+                        }
+
+                        failuresAccessor.DeleteWarning(message);
+                         break;
+                    }
+                }             
+            }
+            return FailureProcessingResult.ProceedWithCommit;
+        }
+    }
+}

+ 193 - 0
MBI/SAGA.MBI/WinView/Space/SpaceManager.cs

@@ -0,0 +1,193 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:SpaceManager
+ * 作者:xulisong
+ * 创建时间: 2018/12/14 10:11:22
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Autodesk.Revit.DB;
+using SAGA.MBI.Common;
+using SAGA.MBI.Model;
+using SAGA.RevitUtils;
+using SAGA.RevitUtils.Extends;
+
+namespace SAGA.MBI.WinView.Space
+{
+    /// <summary>
+    /// 元空间管理相关模操作
+    /// </summary>
+    public class SpaceManager
+    {
+        #region  物理世界空间管理
+        public static List<MSpace> GetPhysicalSpaces(List<string> bimIds)
+        {
+            List<MSpace> spaces = new List<MSpace>();
+
+
+            return spaces;
+        } 
+        #endregion
+
+        /// <summary>
+        /// 更新项目中的空间分割
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <param name="separations"></param>
+        /// <param name="deletedIds"></param>
+        public static void UpdateSpaceSequarate(Document doc,List<SpaceSeparation> separations,List<int> deletedIds)
+        {
+            using (Transaction trans = new Transaction(doc, "更新空间分隔符"))
+            {
+                trans.Start();
+                try
+                {
+                    FailureHandlingOptions fho = trans.GetFailureHandlingOptions();
+                    //警告不提示,但不捕获冲突空间
+                    fho.SetFailuresPreprocessor(new SpaceFailuresPreprocessor());
+                    trans.SetFailureHandlingOptions(fho);
+                    //读取空间所在视图
+                    var view = doc.GetUseView();
+                    if (view == null)
+                    {
+                        MessageShow.Infomation("无法找到-saga标志的视图");
+                        return;
+                    }
+                    //创建空间分隔符
+                    CreateSpaceSeparation(view, separations);              
+                    doc.Delete(deletedIds.Select(id => new ElementId(id)).ToList());
+                    trans.Commit();
+                }
+                catch (Exception e)
+                {
+                    trans.RollBack();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 创建空间分隔符
+        /// </summary>
+        /// <param name="view"></param>
+        /// <param name="separations"></param>
+        public static void CreateSpaceSeparation(ViewPlan view, List<SpaceSeparation> separations)
+        {
+            if (view == null)
+                return;
+            double z = view.GenLevel.Elevation;
+            Document doc = view.Document;
+            Plane p =Plane.CreateByNormalAndOrigin(view.ViewDirection,XYZ.Zero);
+            var sp = SketchPlane.Create(doc, p);
+            foreach (var pair in separations)
+            {             
+                XYZ start = pair.Start.NewZ(z);
+                XYZ end = pair.End.NewZ(z);
+                Line line = null;
+                try
+                {
+                    line = start.NewLine(end);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.StackTrace);
+                }
+                if (line != null)
+                {
+                    var curveArray = new CurveArray();
+                    curveArray.Append(line);
+                    var newLIneId = doc.Create.NewSpaceBoundaryLines(sp, curveArray, view).get_Item(0).Id;
+                    pair.Id = newLIneId.IntegerValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 手动创建空间
+        /// </summary>
+        /// <param name="doc"></param>
+        public static void CreateSpace(Document doc)
+        {
+            using (Transaction trans = new Transaction(doc, "创建空间"))
+            {
+                {
+                    trans.Start();
+                    try
+                    {
+                        doc.LoadFamilySymbolExt(MBIConst.SpaceTagFamilyFilePath);
+                        FailureHandlingOptions fho = trans.GetFailureHandlingOptions();
+                        fho.SetFailuresPreprocessor(new FailuresPreprocessor());
+                        trans.SetFailureHandlingOptions(fho);
+                        var view = doc.GetUseView();
+                        if (view != null)
+                        {
+                            Parameter para = view.GetParameter(BuiltInParameter.VIEW_PHASE);
+                            ElementId phaseId = para.AsElementId();
+
+                            var phase = doc.GetElement(phaseId) as Phase;
+                            var level = view.GenLevel;
+                            //如果视图范围不对,也不能很好的创建空间
+
+                            ICollection<ElementId> elements = doc.Create.NewSpaces2(level, phase, view);
+                        }
+                        else
+                        {
+                            MessageShow.Infomation("没有找到名称以-saga结尾的平面");
+                        }
+                        //doc.Regenerate();
+                        trans.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        trans.RollBack();
+                        MessageShow.Show(e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 处理冲突信息
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <param name="failItem"></param>
+        public static void DealSpaceFailuresPreprocessor(Document doc, List<FailItem> failItem)
+        {
+            //处理错误空间,会出现手动交互的情况
+        }
+
+        /// <summary>
+        /// 上传模型
+        /// </summary>
+        /// <param name="doc"></param>
+        public void UploadModel(Document doc)
+        {
+            doc.Save();
+            string str = "";
+            UploadModeCommand command = new UploadModeCommand();
+            command.Execute(null, ref str, null);
+        }
+    }
+    /// <summary>
+    /// 空间分割信息
+    /// </summary>
+    public class SpaceSeparation
+    {
+        public SpaceSeparation(XYZ start, XYZ end)
+        {
+            this.Start = start;
+            this.End = end;
+        }
+
+        public XYZ Start { get; private set; }
+        public XYZ End { get; private set; }
+        /// <summary>
+        /// 关联Id
+        /// </summary>
+        public int Id { get; set; }
+    }
+
+}

+ 0 - 8
MBI/SAGA.MBI/WinView/Space/WinSelectSpace.xaml.cs

@@ -30,18 +30,10 @@ namespace SAGA.MBI.WinView.Space
             if (rbtnManual.IsChecked != true)
             {
                 lbMain.ItemsSource = new List<ServerSpace>() { new ServerSpace() { Name = "根据算法自动合并", GroupName = "自动合并" } };
-                //    txtTips.Visibility = Visibility.Collapsed;
-                //    lbMain.Visibility = Visibility.Visible;
-                //    stackPanel.HorizontalAlignment = HorizontalAlignment.Stretch;
-                //    stackPanel.VerticalAlignment = VerticalAlignment.Stretch;
             }
             else
             {
                 lbMain.ItemsSource = m_data;
-                //    txtTips.Visibility = Visibility.Visible;
-                //    lbMain.Visibility = Visibility.Collapsed;
-                //    stackPanel.HorizontalAlignment = HorizontalAlignment.Center;
-                //    stackPanel.VerticalAlignment = VerticalAlignment.Center;
             }
 
         }

+ 32 - 0
MBI/SAGA.RevitUtils/MBIExtension/MBIDocExtension.cs

@@ -0,0 +1,32 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:MBIDocExtension
+ * 作者:xulisong
+ * 创建时间: 2018/12/14 10:18:04
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Autodesk.Revit.DB;
+using SAGA.RevitUtils.Extends;
+
+namespace SAGA.RevitUtils
+{
+    public static class MBIDocExtension
+    {
+        /// <summary>
+        /// 获取当前项目带标记的可用视图信息
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <returns></returns>
+        public static ViewPlan GetUseView(this Document doc)
+        {
+            var view = doc.GetElements<ViewPlan>().FirstOrDefault(t =>
+                      t.Name?.IndexOf("-saga") > -1 && t.ViewType == ViewType.FloorPlan);
+            return view;
+        }
+    }
+}

+ 1 - 0
MBI/SAGA.RevitUtils/SAGA.RevitUtils.csproj

@@ -226,6 +226,7 @@
     <Compile Include="Log\LogHelper.cs" />
     <Compile Include="Log\ProjectLogManager.cs" />
     <Compile Include="Log\TSZRLoggerProxy.cs" />
+    <Compile Include="MBIExtension\MBIDocExtension.cs" />
     <Compile Include="MEP\CableTrayExtend.cs" />
     <Compile Include="MEP\CommonComparer.cs" />
     <Compile Include="MEP\CommonFilter.cs" />