yuxingheng/009_DI-Elec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一些奇怪的更新

Browse Source
This commit is contained in:
supercjj2023 2025-09-11 10:19:55 +08:00
commit 8e44650cfb
52 changed files with 554 additions and 2146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1100,3 +1100,12 @@ bin/release/
/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/bin/Debug/Learun.Util.xml /Learun.Framework.Module/Learun.Util/Learun.Util.Operat/bin/Debug/Learun.Util.xml
/Learun.Framework.Module/Learun.Util/Learun.Util/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache /Learun.Framework.Module/Learun.Util/Learun.Util/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
newFront/c#前端/.vs/ newFront/c#前端/.vs/
/Department2/obj/Debug/Department2.csproj.AssemblyReference.cache
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/3ad7c96f-983b-4ac1-9f92-f5a7901a6021.vsidx
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/815c1f12-618a-42f1-9f48-530a4fe7066c.vsidx
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/da4d986e-a00f-4854-84e3-051892159db9.vsidx
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f3f7e679-645b-4fe3-a724-f2e55e8cd4fe.vsidx
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f843a722-ec3e-425b-a704-f3537ea54b49.vsidx
/newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f03e1583-e8e0-43b7-9dbb-a1896ce4b92d.vsidx
/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f2e37380-e651-406b-9320-af642620eee9.vsidx

BIN
Department2/obj/Debug/Department2.csproj.AssemblyReference.cache
View File

Binary file not shown.

5
Learun.Application.Web/AppApi/PlotBOMApiController.cs
View File

@ -127,6 +127,11 @@ namespace Learun.Application.Web.AppApi
{ {
List<BOMTagInfo> allTagsInThisGroup = group.ToList(); List<BOMTagInfo> allTagsInThisGroup = group.ToList();
var GroupName = group.Key.Group; //A-ABC, 正常情况下A是system，放下面；B是tag，放上面 var GroupName = group.Key.Group; //A-ABC, 正常情况下A是system，放下面；B是tag，放上面
if (!GroupName.Contains("-"))
{
continue;
}
var upper_text_Part1 = GroupName.Split('-')[1];//ABC var upper_text_Part1 = GroupName.Split('-')[1];//ABC
var upper_text_Part2 = "";//seq var upper_text_Part2 = "";//seq
#region seq的不同情况 #region seq的不同情况

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db
View File

Binary file not shown.

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-shm
View File

Binary file not shown.

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-wal
View File

Binary file not shown.

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db
View File

Binary file not shown.

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-shm
View File

Binary file not shown.

BIN
newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal
View File

Binary file not shown.

BIN
newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache
View File

Binary file not shown.

19
newFront/c#前端/DI-Electrical/ViewModels/ConfigViewModel.cs
View File

@ -69,9 +69,9 @@ namespace DI_Electrical.ViewModels
MessageBox.Show("本地文件目录不存在。"); MessageBox.Show("本地文件目录不存在。");
return; return;
} }
var data = _configService.parser.ReadFile(_configService.path); //var data = _configService.parser.ReadFile(_configService.path);
_configService._httpService.Init(address, port); //_configService._httpService.Init(address, port);
IsBusy = true; IsBusy = true;
BusyContent = "保存中..."; BusyContent = "保存中...";
var testRes = await _LoginService.Login("1", "11"); var testRes = await _LoginService.Login("1", "11");
@ -85,10 +85,17 @@ namespace DI_Electrical.ViewModels
{ {
address = address.Replace("https://", "").Replace("http://", ""); address = address.Replace("https://", "").Replace("http://", "");
} }
data["Profile"]["Address"] = address; //data["Profile"]["Address"] = address;
data["Profile"]["Port"] = port.ToString(); //data["Profile"]["Port"] = port.ToString();
data["Profile"]["Directory"] = _directory; //data["Profile"]["Directory"] = _directory;
_configService.parser.WriteFile(_configService.path, data); //_configService.parser.WriteFile(_configService.path, data);
//IniHelper.WriteValueFromIniFile("Profile", "strIPAddress", address);
//IniHelper.WriteValueFromIniFile("Profile", "nPort", port.ToString());
//IniHelper.WriteValueFromIniFile("Profile", "strLocalWorkDir", _directory);
_configService.Save("Profile", "strIPAddress", address);
_configService.Save("Profile", "nPort", port.ToString());
_configService.Save("Profile", "strLocalWorkDir", _directory);
GlobalObject.isConfigIniCreateBySys = false; GlobalObject.isConfigIniCreateBySys = false;
GlobalObject.SetLocalFileDirectory(_directory); GlobalObject.SetLocalFileDirectory(_directory);

12
newFront/c#前端/DI-Electrical/ViewModels/LoginViewModel.cs
View File

@ -72,9 +72,9 @@ namespace DI_Electrical.ViewModels
Command_Config = new DelegateCommand(onConfig); Command_Config = new DelegateCommand(onConfig);
containerProvider = container; containerProvider = container;
if (GlobalObject.isConfigIniCreateBySys) if (GlobalObject.isConfigIniCreateBySys)
{ {
var config= container.Resolve<Config>(); var config = container.Resolve<Config>();
config.ShowDialog(); config.ShowDialog();
} }
UserName = _configService.Read(nameof(ConfigIni.UserName)); UserName = _configService.Read(nameof(ConfigIni.UserName));
@ -91,14 +91,14 @@ namespace DI_Electrical.ViewModels
{ {
sPASSWORD = GlobalObject.userInfo.userPs; sPASSWORD = GlobalObject.userInfo.userPs;
} }
curServer = "当前服务器: " + _configService.Read(nameof(ConfigIni.Address)) + ":" + _configService.Read(nameof(ConfigIni.Port)); curServer = "当前服务器: " + _configService.Read("strIPAddress") + ":" + _configService.Read("nPort");
} }
public void onConfig(object o) public void onConfig(object o)
{ {
var config = containerProvider.Resolve<Config>(); var config = containerProvider.Resolve<Config>();
config.ShowDialog(); config.ShowDialog();
curServer = "当前服务器: " + _configService.Read(nameof(ConfigIni.Address)) + ":" + _configService.Read(nameof(ConfigIni.Port)); curServer = "当前服务器: " + _configService.Read("strIPAddress") + ":" + _configService.Read("nPort");
} }
public override async void ExecuteOKCommandAsync(object obj) public override async void ExecuteOKCommandAsync(object obj)
@ -116,7 +116,7 @@ namespace DI_Electrical.ViewModels
else else
{ {
IsBusy = true; BusyContent = "登录中..."; IsBusy = true; BusyContent = "登录中...";
var res = await _Service.Login(UserName, Userpass); var res = await _Service.Login(UserName, Userpass);
IsBusy = false; IsBusy = false;
if (string.IsNullOrEmpty(res)) if (string.IsNullOrEmpty(res))
{ {

BIN
newFront/c#前端/SWS.CAD.Base/bin/Debug/INIFileParser.dll
View File

Binary file not shown.

1181
newFront/c#前端/SWS.CAD.Base/bin/Debug/INIFileParser.xml
View File

File diff suppressed because it is too large Load Diff

13
newFront/c#前端/SWS.CAD/Commands.cs
View File

@ -851,7 +851,18 @@ namespace SWS.CAD
btnCableSinal.ButtonStyle = RibbonButtonStyle.SmallWithText; btnCableSinal.ButtonStyle = RibbonButtonStyle.SmallWithText;
btnCableSinal.CommandHandler = new DelegateCommand(x => btnCableSinal.CommandHandler = new DelegateCommand(x =>
{ {
MessageBox.Show("功能开发中..."); //打开窗体
var para = new Prism.Services.Dialogs.DialogParameters();
var _dialogService = GlobalObject._prismContainer.Resolve<IDialogService>();
_dialogService.ShowDialog(nameof(DialogSignalPredistribution), para, (RES) =>
{
if (RES.Result == ButtonResult.Yes)
{
}
else if (RES.Result == ButtonResult.No)
{ }
});
}); });
btnCableSinal.Image = GlobalObject.ImageSourceFromEmbeddedResourceStream(@"CableSinal.png"); btnCableSinal.Image = GlobalObject.ImageSourceFromEmbeddedResourceStream(@"CableSinal.png");
btnCableSinal.Id = "信号预分配"; btnCableSinal.Id = "信号预分配";

8
newFront/c#前端/SWS.CAD/SWS.CAD.csproj
View File

@ -208,6 +208,7 @@
<Compile Include="ViewModels\DialogPreCheckInViewModel.cs" /> <Compile Include="ViewModels\DialogPreCheckInViewModel.cs" />
<Compile Include="ViewModels\DialogParallelCableViewModel.cs" /> <Compile Include="ViewModels\DialogParallelCableViewModel.cs" />
<Compile Include="ViewModels\DialogNewTagNumberViewModel.cs" /> <Compile Include="ViewModels\DialogNewTagNumberViewModel.cs" />
<Compile Include="ViewModels\DialogSignalPredistributionViewModel.cs" />
<Compile Include="ViewModels\DialogTagSelectViewModel.cs" /> <Compile Include="ViewModels\DialogTagSelectViewModel.cs" />
<Compile Include="ViewModels\DialogUnitSelectViewModel.cs" /> <Compile Include="ViewModels\DialogUnitSelectViewModel.cs" />
<Compile Include="ViewModels\Dialog2SelectViewModel.cs" /> <Compile Include="ViewModels\Dialog2SelectViewModel.cs" />
@ -315,6 +316,9 @@
<Compile Include="Views\Dialog\DialogNewTagNumber.xaml.cs"> <Compile Include="Views\Dialog\DialogNewTagNumber.xaml.cs">
<DependentUpon>DialogNewTagNumber.xaml</DependentUpon> <DependentUpon>DialogNewTagNumber.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\Dialog\DialogSignalPredistribution.xaml.cs">
<DependentUpon>DialogSignalPredistribution.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Dialog\DialogTagSelect.xaml.cs"> <Compile Include="Views\Dialog\DialogTagSelect.xaml.cs">
<DependentUpon>DialogTagSelect.xaml</DependentUpon> <DependentUpon>DialogTagSelect.xaml</DependentUpon>
</Compile> </Compile>
@ -447,6 +451,10 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Views\Dialog\DialogSignalPredistribution.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Dialog\DialogTagSelect.xaml"> <Page Include="Views\Dialog\DialogTagSelect.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>

2
newFront/c#前端/SWS.CAD/SWS.CAD.csproj.user
View File

@ -5,6 +5,6 @@
<StartProgram>D:\Program Files\KunHeng\KunHengCAD V21 zh_CN\kunhengcad.exe</StartProgram> <StartProgram>D:\Program Files\KunHeng\KunHengCAD V21 zh_CN\kunhengcad.exe</StartProgram>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
newFront/c#前端/SWS.CAD/Start.cs
View File

@ -71,6 +71,7 @@ namespace SWS.CAD
GlobalObject._prismContainer.RegisterDialog<DialogChannelMigration, DialogChannelMigrationViewModel>(); GlobalObject._prismContainer.RegisterDialog<DialogChannelMigration, DialogChannelMigrationViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCableConnection, DialogCableConnectionViewModel>(); GlobalObject._prismContainer.RegisterDialog<DialogCableConnection, DialogCableConnectionViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCableConnection_NewStrip, DialogCableConnection_NewStripViewModel>(); GlobalObject._prismContainer.RegisterDialog<DialogCableConnection_NewStrip, DialogCableConnection_NewStripViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSignalPredistribution, DialogSignalPredistributionViewModel>();
} }
} }
} }

13
newFront/c#前端/SWS.CAD/ViewModels/ConfigViewModel.cs
View File

@ -70,7 +70,6 @@ namespace SWS.CAD.ViewModels
Application.ShowAlertDialog("本地文件目录不存在。"); Application.ShowAlertDialog("本地文件目录不存在。");
return; return;
} }
var data = _configService.parser.ReadFile(_configService.path);
_configService._httpService.Init(address, port); _configService._httpService.Init(address, port);
IsBusy = true; IsBusy = true;
@ -85,10 +84,14 @@ namespace SWS.CAD.ViewModels
{ {
address = address.Replace("https://", "").Replace("http://", ""); address = address.Replace("https://", "").Replace("http://", "");
} }
data["Profile"]["Address"] = address; //var data = _configService.parser.ReadFile(_configService.path);
data["Profile"]["Port"] = port.ToString(); //data["Profile"]["Address"] = address;
data["Profile"]["Directory"] = _directory; //data["Profile"]["Port"] = port.ToString();
_configService.parser.WriteFile(_configService.path, data); //data["Profile"]["Directory"] = _directory;
//_configService.parser.WriteFile(_configService.path, data);
_configService.Save("Profile", "strIPAddress", address);
_configService.Save("Profile", "nPort", port.ToString());
_configService.Save("Profile", "strLocalWorkDir", _directory);
GlobalObject.isConfigIniCreateBySys = false; GlobalObject.isConfigIniCreateBySys = false;
GlobalObject.SetLocalFileDirectory(_directory); GlobalObject.SetLocalFileDirectory(_directory);

1
newFront/c#前端/SWS.CAD/ViewModels/DialogIODistributionVM/DialogIODistributionViewModel.cs
View File

@ -602,6 +602,7 @@ namespace SWS.CAD.ViewModels
} }
PanelTreels.Clear(); PanelTreels.Clear();
PanelTreels.AddRange(await _iOModuleService.GetPanelTree()); PanelTreels.AddRange(await _iOModuleService.GetPanelTree());
SelectedTreeNode = PanelTreels.FirstOrDefault(p => p.Text.Equals(positionalvalue)).ChildNodes.FirstOrDefault(c => c.ID.Equals(PanelIDValue));
} }
else if (RES.Result == ButtonResult.No) else if (RES.Result == ButtonResult.No)
{ } { }

72
newFront/c#前端/SWS.CAD/ViewModels/DialogSignalPredistributionViewModel.cs Normal file
View File

@ -0,0 +1,72 @@

using Prism.Ioc;
using Prism.Services.Dialogs;
using SWS.CAD.ViewModels.myViewModelBase;
using SWS.CAD.Views;
using SWS.CAD.Views.CustomControl;
using SWS.Commons;
using System;
using System.Collections.ObjectModel;
using System.Windows;
using System.Windows.Input;
using Unity;
using DelegateCommand = Prism.Commands.DelegateCommand;
namespace SWS.CAD.ViewModels
{
public class DialogSignalPredistributionViewModel : DialogBase, IDialogAware
{
private string objectTypeId;
/// <summary>
/// 新建位号
/// </summary>
public ICommand Command_NewTagNumber { get; set; }
public DialogSignalPredistributionViewModel()
{
title = "电缆信号预分配";
}
public string Title => "";
public event Action<IDialogResult> RequestClose;
public bool CanCloseDialog()
{
return true;
}
public void OnDialogClosed()
{
}
public void OnDialogOpened(IDialogParameters parameters)
{
//listTags = parameters.GetValue<ObservableCollection<KeyValueModel>>(GlobalObject.dialogPar.info.ToString());
objectTypeId = parameters.GetValue<string>(GlobalObject.dialogPar.id.ToString());
}
public override void ExecuteOKCommandAsync(object para)
{
IDialogParameters res = new Prism.Services.Dialogs.DialogParameters();
//res.Add(GlobalObject.dialogPar.info.ToString(), TagNumber);
RequestClose.Invoke(new DialogResult(ButtonResult.Yes, res));
}
public override void ExecuteCloseCommand(object parameter)
{
if (parameter as string == "ClickNo")
{
DialogResult res = new DialogResult(ButtonResult.No);
RequestClose.Invoke(res);
}
else
{
RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
}
this.Dispose();
}
}
}

2
newFront/c#前端/SWS.CAD/ViewModels/LoginViewModel.cs
View File

@ -92,7 +92,7 @@ namespace SWS.CAD.ViewModels
{ {
sPASSWORD = GlobalObject.userInfo.userPs; sPASSWORD = GlobalObject.userInfo.userPs;
} }
curServer = "当前服务器: " + _configService.Read(nameof(ConfigIni.Address)) + ":" + _configService.Read(nameof(ConfigIni.Port)); curServer = "当前服务器: " + _configService.Read("strIPAddress") + ":" + _configService.Read("nPort");
} }
public override async void ExecuteOKCommandAsync(object obj) public override async void ExecuteOKCommandAsync(object obj)
{ {

2
newFront/c#前端/SWS.CAD/Views/Dialog/DialogIODistributions/DialogIODistribution.xaml
View File

@ -501,6 +501,8 @@
ItemContainerStyle="{StaticResource ExpandedTreeViewItemStyle}" ItemContainerStyle="{StaticResource ExpandedTreeViewItemStyle}"
PreviewMouseRightButtonDown="RadTreeView_PreviewMouseRightButtonDown" PreviewMouseRightButtonDown="RadTreeView_PreviewMouseRightButtonDown"
Margin="5" telerik:StyleManager.Theme="Office_Blue" AllowDrop="True" Margin="5" telerik:StyleManager.Theme="Office_Blue" AllowDrop="True"
AutoScrollToSelectedItem="True"
IsVirtualizing="True"
> >
<telerik:RadTreeView.ItemTemplate> <telerik:RadTreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}"> <HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}">

3
newFront/c#前端/SWS.CAD/Views/Dialog/DialogIODistributions/DialogIODistribution.xaml.cs
View File

@ -1,4 +1,6 @@
 
using System;
using System.ComponentModel;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
@ -21,6 +23,7 @@ namespace SWS.CAD.Views.Dialog
private void RadTreeView_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e) private void RadTreeView_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
{ {
var treeView = sender as RadTreeView; var treeView = sender as RadTreeView;
var originalSource = e.OriginalSource as DependencyObject; var originalSource = e.OriginalSource as DependencyObject;

116
newFront/c#前端/SWS.CAD/Views/Dialog/DialogSignalPredistribution.xaml Normal file
View File

@ -0,0 +1,116 @@
<UserControl x:Class="SWS.CAD.Views.Dialog.DialogSignalPredistribution"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:prism="http://prismlibrary.com/"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
xmlns:local="clr-namespace:SWS.CAD.Views.Dialog"
xmlns:CustomControl="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl"
Width="1000" Height="800"
mc:Ignorable="d" >
<prism:Dialog.WindowStyle>
<Style TargetType="Window">
<!--最大化-->
<Setter Property="Width" Value="1000" />
<Setter Property="Height" Value="800" />
<Setter Property="SizeToContent" Value="WidthAndHeight" />
<Setter Property="WindowState" Value="Normal" />
<Setter Property="WindowStyle" Value="None" />
<Setter Property="ResizeMode" Value="NoResize" />
</Style>
</prism:Dialog.WindowStyle>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/SWS.WPF;component/Style/CustomStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<telerik:RadBusyIndicator BusyContent="{Binding BusyContent}" IsBusy="{Binding IsBusy}">
<StackPanel Background="#f0f0f0">
<CustomControl:customWindowTitleBar x:Name="titleBar" />
<StackPanel Grid.Row="1" Orientation="Horizontal">
<GroupBox Margin="5,10,5,5"
VerticalAlignment="Bottom"
Header="通讯信号">
<StackPanel Orientation="Horizontal">
<TextBlock Text="是否通讯母线" Margin="5"/>
<RadioButton Content="是" GroupName="OptionGroup1" Margin="5"/>
<RadioButton x:Name="RadioButton1" Content="否" GroupName="OptionGroup1" Margin="5"/>
<TextBlock Text="通讯格式" Margin="5"/>
<ComboBox />
</StackPanel>
</GroupBox>
<GroupBox Margin="5,0,5,5"
VerticalAlignment="Bottom"
Header="信号类型">
<StackPanel Orientation="Horizontal">
<RadioButton IsEnabled="{Binding IsChecked,ElementName=RadioButton1}" Content="Digital" GroupName="OptionGroup2" Margin="5"/>
<RadioButton IsEnabled="{Binding IsChecked,ElementName=RadioButton1}" Content="4-20mA" GroupName="OptionGroup2" Margin="5"/>
<RadioButton IsEnabled="{Binding IsChecked,ElementName=RadioButton1}" Content="-10V-10V" GroupName="OptionGroup2" Margin="5"/>
<RadioButton IsEnabled="{Binding IsChecked,ElementName=RadioButton1}" Content="PT100" GroupName="OptionGroup2" Margin="5"/>
<RadioButton IsEnabled="{Binding IsChecked,ElementName=RadioButton1}" Content="Pulse" GroupName="OptionGroup2" Margin="5"/>
</StackPanel>
</GroupBox>
</StackPanel>
<GroupBox Margin="5,0,5,5"
Grid.Row="2"
VerticalAlignment="Bottom"
Header="电缆配置信息">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<StackPanel>
<Border BorderThickness="0 0 0 1" Margin="10,0,0,0">
<TextBlock Text="选择系统柜" Foreground="Black" />
</Border>
<!-- 左侧树形结构 -->
<Border>
<telerik:RadTreeView x:Name="treeView1"
Height="660"
Background="White"
IsLineEnabled="True"
ItemsSource="{Binding PanelTreels}"
SelectedItem="{Binding SelectedTreeNode,Mode=TwoWay}"
Margin="5"
telerik:StyleManager.Theme="Office_Blue"
AllowDrop="True"
AutoScrollToSelectedItem="True"
IsVirtualizing="True"
>
<telerik:RadTreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}">
<TextBlock Text="{Binding Text}">
</TextBlock>
<HierarchicalDataTemplate.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}">
<TextBlock Text="{Binding Text}"/>
<HierarchicalDataTemplate.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding PanelTreels}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Text}"/>
<TextBlock Text=" (" />
<TextBlock Text="{Binding NodeExtData.ChannelsSpared}" FontWeight="Bold" />
<TextBlock Text=")" />
</StackPanel>
</HierarchicalDataTemplate>
</HierarchicalDataTemplate.ItemTemplate>
</HierarchicalDataTemplate>
</HierarchicalDataTemplate.ItemTemplate>
</HierarchicalDataTemplate>
</telerik:RadTreeView.ItemTemplate>
</telerik:RadTreeView>
</Border>
</StackPanel>
</Grid>
</GroupBox>
</StackPanel>
</telerik:RadBusyIndicator>
</UserControl>

28
newFront/c#前端/SWS.CAD/Views/Dialog/DialogSignalPredistribution.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
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.Navigation;
using System.Windows.Shapes;
namespace SWS.CAD.Views.Dialog
{
/// <summary>
/// DialogSignalPredistribution.xaml 的交互逻辑
/// </summary>
public partial class DialogSignalPredistribution : UserControl
{
public DialogSignalPredistribution()
{
InitializeComponent();
}
}
}

5
newFront/c#前端/SWS.CAD/Views/Style/CustomStyles.xaml
View File

@ -1455,10 +1455,9 @@
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<!-- 按钮禁用 --> <!-- 按钮禁用 -->
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter TargetName="PART_Icon" Property="Fill" <Setter TargetName="PART_Icon" Property="Fill" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
</Trigger> </Trigger>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" /> <Setter TargetName="border" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" />

9
newFront/c#前端/SWS.Commons/GlobalObject.cs
View File

@ -154,10 +154,11 @@ namespace SWS.Commons
{ {
if (string.IsNullOrEmpty(_LocalFileDirectory)) if (string.IsNullOrEmpty(_LocalFileDirectory))
{ {
string path = Environment.ExpandEnvironmentVariables(@"%USERPROFILE%\AppData\Roaming\SWS\Config.ini"); //string path = configPath;
FileIniDataParser parser = new FileIniDataParser(); //FileIniDataParser parser = new FileIniDataParser();
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
_LocalFileDirectory = data["Profile"]["Directory"]; //_LocalFileDirectory = data["Profile"]["strLocalWorkDir"];
_LocalFileDirectory = IniHelper.ReadValueFromIniFile("Profile", "strLocalWorkDir");
return _LocalFileDirectory; return _LocalFileDirectory;
} }
else else

56
newFront/c#前端/SWS.Commons/Helper/IniHelper.cs Normal file
View File

@ -0,0 +1,56 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
namespace SWS.Commons
{
public static class IniHelper
{
[DllImport("kernel32", CharSet = CharSet.Unicode)]
private static extern long WritePrivateProfileString(string section, string key, string val, string filePath);
[DllImport("kernel32", CharSet = CharSet.Unicode)]
private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
/// <summary>
///读取ini文件数据
/// </summary>
/// <param name="Section">段</param>
/// <param name="Key">键名</param>
/// <param name="def">默认值</param>
/// <param name="filePath">文件路径</param>
/// <returns>读出内容</returns>
public static string ReadValueFromIniFile(string Section, string Key, string def=null, string filePath= null)
{
if (def == null)
{ def = ""; }
if (filePath == null)
{
filePath = GlobalObject.configPath;
}
StringBuilder temp = new StringBuilder(4096);
int i = GetPrivateProfileString(Section, Key, def, temp, 4096, filePath);
return temp.ToString();
}
/// <summary>
/// 写入数据到ini文件
/// </summary>
/// <param name="Section">段</param>
/// <param name="Key">键名</param>
/// <param name="Value">键值</param>
/// <param name="filePath">文件路径</param>
public static void WriteValueFromIniFile(string Section, string Key, string Value, string filePath = null)
{
if (filePath == null)
{
filePath = GlobalObject.configPath;
}
WritePrivateProfileString(Section, Key, Value, filePath);
}
}
}

2
newFront/c#前端/SWS.Commons/Helper/LoggerHelper.cs
View File

@ -24,6 +24,8 @@ namespace SWS.Commons
string dllPath = codeBase.Replace("file:///", ""); string dllPath = codeBase.Replace("file:///", "");
dllPath = Path.GetDirectoryName(dllPath); dllPath = Path.GetDirectoryName(dllPath);
logPath = Path.Combine(dllPath, "Logs\\"); logPath = Path.Combine(dllPath, "Logs\\");
if (!Directory.Exists(logPath))
{ Directory.CreateDirectory(logPath); }
var configFile = new FileInfo(Path.Combine(dllPath, "log4net.config")); var configFile = new FileInfo(Path.Combine(dllPath, "log4net.config"));
log4net.Config.XmlConfigurator.ConfigureAndWatch(configFile); log4net.Config.XmlConfigurator.ConfigureAndWatch(configFile);
} }

1
newFront/c#前端/SWS.Commons/SWS.Commons.csproj
View File

@ -110,6 +110,7 @@
<Compile Include="Helper\Converter\RadGridViewRowToBoolConverter.cs" /> <Compile Include="Helper\Converter\RadGridViewRowToBoolConverter.cs" />
<Compile Include="Helper\Converter\ColumnValueConverter.cs" /> <Compile Include="Helper\Converter\ColumnValueConverter.cs" />
<Compile Include="Helper\Converter\StatusToColourConverter.cs" /> <Compile Include="Helper\Converter\StatusToColourConverter.cs" />
<Compile Include="Helper\IniHelper.cs" />
<Compile Include="Helper\FileHelper.cs" /> <Compile Include="Helper\FileHelper.cs" />
<Compile Include="Helper\LoggerHelper.cs" /> <Compile Include="Helper\LoggerHelper.cs" />
<Compile Include="Helper\PasswordHelper.cs" /> <Compile Include="Helper\PasswordHelper.cs" />

2
newFront/c#前端/SWS.Commons/SWS.Commons.csproj.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

32
newFront/c#前端/SWS.Electrical/GlobalObj.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@ -11,6 +12,7 @@ using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using IniParser; using IniParser;
using IniParser.Model;
using Newtonsoft.Json; using Newtonsoft.Json;
using Prism.Ioc; using Prism.Ioc;
using SWS.Commons; using SWS.Commons;
@ -41,17 +43,29 @@ namespace SWS.Electrical
{ {
try try
{ {
var data = configIni.ReadFile(GlobalObject.configPath); //var parser = new FileIniDataParser();
string token = data["LoginInfo"]["LoginToken"]; //string[] lines = File.ReadAllLines(GlobalObject.configPath);
string loginkey = data["LoginInfo"]["LoginMark"]; //IniData data = parser.Parser.Parse(File.ReadAllText(GlobalObject.configPath));
string curProjId = data["LoginInfo"]["CurProjId"]; //var data = configIni.ReadFile(GlobalObject.configPath);
LocalWorkDir= data["Profile"]["strLocalWorkDir"]; //string token = data["LoginInfo"]["LoginToken"];
string address = data["Profile"]["strIPAddress"]; //string loginkey = data["LoginInfo"]["LoginMark"];
string port = data["Profile"]["nPort"]; //string curProjId = data["LoginInfo"]["CurProjId"];
string dbType = data["Profile"]["nConType"]; //LocalWorkDir= data["Profile"]["strLocalWorkDir"];
//string address = data["Profile"]["strIPAddress"];
//string port = data["Profile"]["nPort"];
//string dbType = data["Profile"]["nConType"];
//string domain= data["Profile"]["strDomainName"];
string token = IniHelper.ReadValueFromIniFile("LoginInfo", "LoginToken");
string loginkey = IniHelper.ReadValueFromIniFile("LoginInfo", "LoginMark");
string curProjId = IniHelper.ReadValueFromIniFile("LoginInfo", "CurProjId");
LocalWorkDir = IniHelper.ReadValueFromIniFile("Profile", "strLocalWorkDir");
string address = IniHelper.ReadValueFromIniFile("Profile", "strIPAddress");
string port = IniHelper.ReadValueFromIniFile("Profile", "nPort");
string dbType = IniHelper.ReadValueFromIniFile("Profile", "nConType");
string domain = IniHelper.ReadValueFromIniFile("Profile", "strDomainName");
if (dbType == "1") if (dbType == "1")
{ {
string strDomain = data["Profile"]["strDomainName"]; string strDomain = domain;
GlobalObject.client = new HttpClient() GlobalObject.client = new HttpClient()
{ {
BaseAddress = new Uri($"{strDomain}/api/"), BaseAddress = new Uri($"{strDomain}/api/"),

1
newFront/c#前端/SWS.Electrical/SWS.Electrical.csproj
View File

@ -153,6 +153,7 @@
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="配置说明.docx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\SWS.CAD.Base\SWS.CAD.Base.csproj"> <ProjectReference Include="..\SWS.CAD.Base\SWS.CAD.Base.csproj">

122
newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
View File

@ -130,6 +130,7 @@ namespace SWS.Electrical.ViewModels
if (value != this._selectRange) if (value != this._selectRange)
{ {
this._selectRange = value; this._selectRange = value;
RangeChange(value);
RaisePropertyChanged(nameof(selectRange)); RaisePropertyChanged(nameof(selectRange));
} }
} }
@ -167,6 +168,22 @@ namespace SWS.Electrical.ViewModels
} }
} }
} }
private ObservableCollection<KeyValueModel> _listValue;
/// <summary>
/// 输入值 列表
/// </summary>
public ObservableCollection<KeyValueModel> listValue
{
get { return this._listValue; }
set
{
if (value != this._listValue)
{
this._listValue = value;
RaisePropertyChanged(nameof(listValue));
}
}
}
private string _inputValue = ""; private string _inputValue = "";
/// <summary> /// <summary>
/// 输入值 /// 输入值
@ -195,11 +212,15 @@ namespace SWS.Electrical.ViewModels
EnginedataService _ServiceEnginedata; EnginedataService _ServiceEnginedata;
ObjectTypeService _ServiceObjectType; ObjectTypeService _ServiceObjectType;
ProjectSettingsService _ServiceProjectSettings; ProjectSettingsService _ServiceProjectSettings;
DataItemService _ServiceDataItem;
List<string> listTagNumberSucc = new List<string>(); List<string> listTagNumberSucc = new List<string>();
private bool isSearch = false;//是否正在查询 private bool isSearch = false;//是否正在查询
private bool isDrawing = false;//是否正在画图 private bool isDrawing = false;//是否正在画图
private string dwgName = string.Empty; private string dwgName = string.Empty;
private List<string> listLibraryTagName = new List<string>();//元件图纸上的位号属性名称, private List<string> listLibraryTagName = new List<string>();//元件图纸上的位号属性名称,
private List<KeyValueModel> listDeck=new List<KeyValueModel>();//甲板号值列表
private List<KeyValueModel> listArea = new List<KeyValueModel>();//区域值列表
private List<KeyValueModel> listSystem = new List<KeyValueModel>();//所属系统值列表
public DialogAutoArrangeLayoutViewModel() public DialogAutoArrangeLayoutViewModel()
{ {
Command_StartDrawing = new DelegateCommand(onStartDrawing); Command_StartDrawing = new DelegateCommand(onStartDrawing);
@ -215,6 +236,7 @@ namespace SWS.Electrical.ViewModels
_ServiceEnginedata = GlobalObject.container.Resolve<EnginedataService>(); _ServiceEnginedata = GlobalObject.container.Resolve<EnginedataService>();
_ServiceObjectType = GlobalObject.container.Resolve<ObjectTypeService>(); _ServiceObjectType = GlobalObject.container.Resolve<ObjectTypeService>();
_ServiceProjectSettings = GlobalObject.container.Resolve<ProjectSettingsService>(); _ServiceProjectSettings = GlobalObject.container.Resolve<ProjectSettingsService>();
_ServiceDataItem= GlobalObject.container.Resolve<DataItemService>();
listDrawings = new ObservableCollection<DtoDrawing>(); listDrawings = new ObservableCollection<DtoDrawing>();
listBasePoint = new ObservableCollection<DtoAutoPlotLayout>(); listBasePoint = new ObservableCollection<DtoAutoPlotLayout>();
listMsg = new ObservableCollection<TextBlock>(); listMsg = new ObservableCollection<TextBlock>();
@ -223,7 +245,6 @@ namespace SWS.Electrical.ViewModels
list.Add(new KeyValueModel { Key = "区域", Value = "区域" }); list.Add(new KeyValueModel { Key = "区域", Value = "区域" });
list.Add(new KeyValueModel { Key = "所属系统", Value = "所属系统" }); list.Add(new KeyValueModel { Key = "所属系统", Value = "所属系统" });
listRange = new ObservableCollection<KeyValueModel>(list); listRange = new ObservableCollection<KeyValueModel>(list);
selectRange = listRange[0];
listOperator = new ObservableCollection<KeyValueModel>() listOperator = new ObservableCollection<KeyValueModel>()
{ new KeyValueModel { Key = "等于", Value = "=" } { new KeyValueModel { Key = "等于", Value = "=" }
}; };
@ -243,7 +264,33 @@ namespace SWS.Electrical.ViewModels
{ {
} }
private List<TreeModel> GetChildNodes(TreeModel treeModel)
{
List<TreeModel> listModel = new List<TreeModel>();
if (treeModel.ChildNodes != null && treeModel.ChildNodes.Any())
{
foreach (var item in treeModel.ChildNodes)
{
if (item.NodeType == "1")
{
listModel.Add(item);
}
else
{
var list = GetChildNodes(item);
if (list.Any())
{
listModel.AddRange(list);
}
}
}
return listModel;
}
else
{
return listModel;
}
}
public async void OnDialogOpened(IDialogParameters parameters) public async void OnDialogOpened(IDialogParameters parameters)
{ {
try try
@ -259,8 +306,19 @@ namespace SWS.Electrical.ViewModels
if (item.NodeType == "1") if (item.NodeType == "1")
{ {
listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text }); listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text });
ec_drawing_file dwgFile = JsonConvert.DeserializeObject<ec_drawing_file>(model.NodeExtData.ToString()); }
else
{
if (item.Text == "封面、目录、设计说明" || item.Text == "材料表")
{ continue; }
var list = GetChildNodes(item);
if (list.Any())
{
foreach (var dto in list)
{
listDrawings.Add(new DtoDrawing() { DrawingFileID = dto.ID, DrawingFileName = dto.Text });
}
}
} }
} }
} }
@ -289,14 +347,24 @@ namespace SWS.Electrical.ViewModels
if (item.NodeType == "1") if (item.NodeType == "1")
{ {
listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text }); listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text });
ec_drawing_file dwgFile = JsonConvert.DeserializeObject<ec_drawing_file>(model.NodeExtData.ToString()); }
else
{
if (item.Text == "封面、目录、设计说明" || item.Text == "材料表")
{ continue; }
var list = GetChildNodes(item);
if (list.Any())
{
foreach (var dto in list)
{
listDrawings.Add(new DtoDrawing() { DrawingFileID = dto.ID, DrawingFileName = dto.Text });
}
}
} }
} }
} }
} }
AddMsg($"布置图列表加载完成！"); AddMsg($"布置图列表加载完成！");
} }
var settingModel = await _ServiceProjectSettings.GetEntity("布置图图例显示位号名称"); var settingModel = await _ServiceProjectSettings.GetEntity("布置图图例显示位号名称");
if (settingModel == null) if (settingModel == null)
@ -304,16 +372,48 @@ namespace SWS.Electrical.ViewModels
listLibraryTagName.Add("位号");//默认 listLibraryTagName.Add("位号");//默认
} }
else { listLibraryTagName = settingModel.SettingValue.Split(',').ToList(); } else { listLibraryTagName = settingModel.SettingValue.Split(',').ToList(); }
//区域下拉框对应值列表
var listDetail = await _ServiceDataItem.GetDetails("Area");
if (listDetail != null && listDetail.Any())
{
foreach (var item in listDetail)
{ listArea.Add(new KeyValueModel() { Key=item.DataItemName, Value=item.DataItemName }); }
}
//甲板号下拉框对应值列表
listDetail = await _ServiceDataItem.GetDetails("甲板号");
if (listDetail != null && listDetail.Any())
{
foreach (var item in listDetail)
{ listDeck.Add(new KeyValueModel() { Key = item.DataItemName, Value = item.DataItemName }); }
}
//所属系统下拉框对应值列表
listDetail = await _ServiceDataItem.GetDetails("Be_DrawingSystem");
if (listDetail != null && listDetail.Any())
{
foreach (var item in listDetail)
{ listSystem.Add(new KeyValueModel() { Key = item.DataItemName, Value = item.DataItemName }); }
}
selectRange = listRange[0];
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show("DialogOpened异常：" + ex.Message); MessageBox.Show("DialogOpened异常：" + ex.Message);
} }
//selectRange = listRange[2];
//inputValue = "声力电话";
} }
/// <summary>
/// 下拉值列表绑定
/// </summary>
/// <param name="model"></param>
private void RangeChange(KeyValueModel model)
{
inputValue = "";
if (model.Value == "甲板号")
{ listValue = new ObservableCollection<KeyValueModel>(listDeck); }
else if (model.Value == "区域")
{ listValue = new ObservableCollection<KeyValueModel>(listArea); }
else if (model.Value == "所属系统")
{ listValue = new ObservableCollection<KeyValueModel>(listSystem); }
}
/// <summary> /// <summary>
/// 获取基点信息 /// 获取基点信息
/// </summary> /// </summary>

15
newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
View File

@ -178,13 +178,22 @@
FontSize="16" FontSize="16"
ItemsSource="{Binding listOperator}" ItemsSource="{Binding listOperator}"
SelectedItem="{Binding selectOperator, Mode=TwoWay}" /> SelectedItem="{Binding selectOperator, Mode=TwoWay}" />
<ComboBox
<TextBox Grid.Column="1"
Width="200"
Height="25"
Margin="5,0,0,0"
DisplayMemberPath="Key"
FontSize="16"
IsEditable="True"
ItemsSource="{Binding listValue}"
Text="{Binding inputValue, Mode=TwoWay}" />
<!--<TextBox
Width="200" Width="200"
Height="25" Height="25"
Margin="5,0,0,0" Margin="5,0,0,0"
FontSize="16" FontSize="16"
Text="{Binding inputValue}" /> Text="{Binding inputValue}" />-->
</StackPanel> </StackPanel>
<StackPanel <StackPanel

4
newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8006F31A06196293D0E58F4239B97FC4F768BCF414C1B4C2472A1C22D26CF0B1" #pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABECE6D950BC12BD1A8DC30FBB96A86A4798DF4A77E402D6CDDD9CF497D2FC76"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -85,7 +85,7 @@ namespace SWS.Electrical.Views {
#line hidden #line hidden
#line 211 "..\..\..\Views\DialogAutoArrangeLayout.xaml" #line 219 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgTag; internal System.Windows.Controls.DataGrid dgTag;

4
newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.i.cs
View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8006F31A06196293D0E58F4239B97FC4F768BCF414C1B4C2472A1C22D26CF0B1" #pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "55992553F782D436B236E9D0626B49AE48376927B5906F253898CDC4189B1D22"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -85,7 +85,7 @@ namespace SWS.Electrical.Views {
#line hidden #line hidden
#line 211 "..\..\..\Views\DialogAutoArrangeLayout.xaml" #line 220 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgTag; internal System.Windows.Controls.DataGrid dgTag;

10
newFront/c#前端/SWS.Electrical/配置说明.docx Normal file
View File

@ -0,0 +1,10 @@
第1步：把文件拷贝到D盘文件夹[SWS.Electrical]里面
第2步：在坤恒CAD的安装目录里，找到文件：on_start.lsp ，用记事本打开
第3步：把下面一行命令，添加到最下面
(command "netload" "D:\\SWS.Electrical\\SWS.Electrical.dll")
PS:存放文件夹路径可以自己定

59
newFront/c#前端/SWS.Service/ConfigService.cs
View File

@ -2,6 +2,7 @@
using SWS.Commons; using SWS.Commons;
using System; using System;
using System.IO; using System.IO;
using static System.Collections.Specialized.BitVector32;
namespace SWS.Service namespace SWS.Service
{ {
@ -16,13 +17,12 @@ namespace SWS.Service
void SetDefaultConfigValue() void SetDefaultConfigValue()
{ {
if (!File.Exists(path)) if (!File.Exists(path))
{//默认值 {
//默认值
var data = parser.Parser.Parse(""); var data = parser.Parser.Parse("");
data["Profile"]["strIPAddress"] = "1.117.161.11"; data["Profile"]["strIPAddress"] = "1.117.161.11";
data["Profile"]["nPort"] = "8080"; data["Profile"]["nPort"] = "8080";
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
data["Profile"]["strLocalWorkDir"] = $"{userProfilePath}\\AppData\\Roaming\\BricsCAD Electrical"; data["Profile"]["strLocalWorkDir"] = $"{userProfilePath}\\AppData\\Roaming\\BricsCAD Electrical";
Directory.CreateDirectory(Path.GetDirectoryName(path)); Directory.CreateDirectory(Path.GetDirectoryName(path));
parser.WriteFile(path, data); parser.WriteFile(path, data);
@ -40,17 +40,21 @@ namespace SWS.Service
string address; string address;
int port; int port;
string locDrawingPath; string locDrawingPath;
Read(out address, out port,out locDrawingPath); Read(out address, out port, out locDrawingPath);
_httpService.Init(address, port); _httpService.Init(address, port);
} }
public void Read(out string address, out int port, out string directory) public void Read(out string address, out int port, out string directory)
{ {
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
address = data["Profile"]["strIPAddress"]; //address = data["Profile"]["strIPAddress"];
port = int.Parse(data["Profile"]["nPort"]); //port = int.Parse(data["Profile"]["nPort"]);
directory = data["Profile"]["strLocalWorkDir"]; //directory = data["Profile"]["strLocalWorkDir"];
address = IniHelper.ReadValueFromIniFile("Profile", "strIPAddress");
port = int.Parse(IniHelper.ReadValueFromIniFile("Profile", "nPort"));
directory = IniHelper.ReadValueFromIniFile("Profile", "strLocalWorkDir");
} }
/// <summary> /// <summary>
/// 查询某个 /// 查询某个
/// </summary> /// </summary>
@ -58,8 +62,11 @@ namespace SWS.Service
/// <returns></returns> /// <returns></returns>
public string Read(string keyName) public string Read(string keyName)
{ {
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
return data["Profile"][keyName]; //return data["Profile"][keyName];
var data = IniHelper.ReadValueFromIniFile("Profile", keyName);
return data;
} }
/// <summary> /// <summary>
/// 查询某个 /// 查询某个
@ -67,14 +74,17 @@ namespace SWS.Service
/// <param name="session">节点</param> /// <param name="session">节点</param>
/// <param name="keyName">key名称</param> /// <param name="keyName">key名称</param>
/// <returns></returns> /// <returns></returns>
public string Read(string session,string keyName) public string Read(string session, string keyName)
{ {
try try
{ {
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
return data[session][keyName]; //return data[session][keyName];
var data = IniHelper.ReadValueFromIniFile(session, keyName);
return data;
} }
catch catch
{ {
return null; return null;
} }
@ -86,9 +96,10 @@ namespace SWS.Service
/// <param name="value"></param> /// <param name="value"></param>
public void Save(string keyName, string value) public void Save(string keyName, string value)
{ {
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
data["Profile"][keyName] = value; //data["Profile"][keyName] = value;
parser.WriteFile(path, data); //parser.WriteFile(path, data);
IniHelper.WriteValueFromIniFile("Profile", keyName, value);
} }
/// <summary> /// <summary>
/// 保存某个值 /// 保存某个值
@ -98,9 +109,11 @@ namespace SWS.Service
/// <param name="value">值</param> /// <param name="value">值</param>
public void Save(string session, string keyName, string value) public void Save(string session, string keyName, string value)
{ {
var data = parser.ReadFile(path); //var data = parser.ReadFile(path);
data[session][keyName] = value; //data[session][keyName] = value;
parser.WriteFile(path, data); //parser.WriteFile(path, data);
IniHelper.WriteValueFromIniFile(session, keyName, value);
} }
} }
} }

8
newFront/c#前端/SWS.WPF/Style/CustomStyles.xaml
View File

@ -1,10 +1,10 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl"
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
xmlns:CustomControl="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl" xmlns:CustomControl="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl"
xmlns:cvt="clr-namespace:SWS.Commons.Helper.Converter;assembly=SWS.Commons" xmlns:cvt="clr-namespace:SWS.Commons.Helper.Converter;assembly=SWS.Commons"
xmlns:local="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl"
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"> xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation">
<!-- 系统颜色 --> <!-- 系统颜色 -->
@ -579,7 +579,7 @@
</Style> </Style>
<!-- 多选搜索 Combox End --> <!-- 多选搜索 Combox End -->
<!-- 信号状态样式 --> <!-- 信号状态样式 -->
<Style x:Key="ToDeleteStatusStyle" TargetType="telerik:GridViewRow"> <Style x:Key="ToDeleteStatusStyle" TargetType="telerik:GridViewRow">
<Setter Property="Foreground" Value="#db9fa9" /> <Setter Property="Foreground" Value="#db9fa9" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
@ -595,7 +595,7 @@
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style x:Key="ConfirmedStatusStyle" TargetType="telerik:GridViewRow"> <Style x:Key="ConfirmedStatusStyle" TargetType="telerik:GridViewRow">
<Setter Property="Foreground" Value="DarkGray" /> <Setter Property="Foreground" Value="Black" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>

12
newFront/c#前端/SWS.WPF/ViewModels/DialogSignalManagementVM/DialogSignalManagementViewModel.cs
View File

@ -458,14 +458,22 @@ namespace SWS.WPF.ViewModels
ReviewCountdown.IsActive = true; ReviewCountdown.IsActive = true;
if (ReviewCountdown.TimeRemaining<= TimeSpan.Zero) if (ReviewCountdown.TimeRemaining<= TimeSpan.Zero)
{ {
System.Windows.MessageBox.Show($"送审时间已过期: {ReviewCountdown.TimeRemaining:%d}天 {ReviewCountdown.TimeRemaining:hh\\:mm\\:ss}", "错误", MessageBoxButton.OK, MessageBoxImage.Error); if ((DateTime)GlobalObject.curProject.IO_real_issue == null)
{
System.Windows.MessageBox.Show($"送审时间已过期: {ReviewCountdown.TimeRemaining:%d}天 {ReviewCountdown.TimeRemaining:hh\\:mm\\:ss}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
} }
ConstructionCountdown.TimeRemaining = (TimeSpan)(ConstructionTime - currentTime); ConstructionCountdown.TimeRemaining = (TimeSpan)(ConstructionTime - currentTime);
ConstructionCountdown.IsActive = true; ConstructionCountdown.IsActive = true;
if (ConstructionCountdown.TimeRemaining <= TimeSpan.Zero) if (ConstructionCountdown.TimeRemaining <= TimeSpan.Zero)
{ {
System.Windows.MessageBox.Show($"施工时间已过期: {ConstructionCountdown.TimeRemaining:%d}天 {ConstructionCountdown.TimeRemaining:hh\\:mm\\:ss}", "错误", MessageBoxButton.OK, MessageBoxImage.Error); if ((DateTime)GlobalObject.curProject.IO_real_construct == null)
{
System.Windows.MessageBox.Show($"施工时间已过期: {ConstructionCountdown.TimeRemaining:%d}天 {ConstructionCountdown.TimeRemaining:hh\\:mm\\:ss}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
} }
// 初始化定时器 // 初始化定时器

BIN
newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources
View File

Binary file not shown.

BIN
newFront/c#前端/SWS.WPF/obj/Debug/Style/CustomStyles.baml
View File

Binary file not shown.

111
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogInput.g.cs
View File

@ -1,111 +0,0 @@
#pragma checksum "..\..\..\Views\DialogInput.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "79ABA349AD65127222E52DC2168828F367F61B79E30D6794AC600F9A9A45AF1D"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using Microsoft.Xaml.Behaviors;
using Microsoft.Xaml.Behaviors.Core;
using Microsoft.Xaml.Behaviors.Input;
using Microsoft.Xaml.Behaviors.Layout;
using Microsoft.Xaml.Behaviors.Media;
using Prism.DryIoc;
using Prism.Interactivity;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogInput
/// </summary>
public partial class DialogInput : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialoginput.xaml", System.UriKind.Relative);
#line 1 "..\..\..\Views\DialogInput.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
this._contentLoaded = true;
}
}
}

192
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.cs
View File

@ -1,192 +0,0 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BBBAAC2D30DDCBE426FDE8827BDBF7527EEDC8C0F823DBAF3EBE2D35FF1D1F8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using Microsoft.Xaml.Behaviors;
using Microsoft.Xaml.Behaviors.Core;
using Microsoft.Xaml.Behaviors.Input;
using Microsoft.Xaml.Behaviors.Layout;
using Microsoft.Xaml.Behaviors.Media;
using Prism.DryIoc;
using Prism.Interactivity;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.Commons.Helper.Converter;
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogSignalManagement
/// </summary>
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 213 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
#line default
#line hidden
#line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtReviewCountdown;
#line default
#line hidden
#line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
#line default
#line hidden
#line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton PopupButton;
#line default
#line hidden
#line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.Popup CustomPopup;
#line default
#line hidden
#line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton myButton;
#line default
#line hidden
#line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialogsignalmanagements/dialogsignalmanagement.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.titleBar = ((SWS.CustomControl.customWindowTitleBar)(target));
return;
case 2:
this.txtReviewCountdown = ((System.Windows.Controls.TextBlock)(target));
return;
case 3:
this.txtConstructionCountdown = ((System.Windows.Controls.TextBlock)(target));
return;
case 4:
this.PopupButton = ((SWS.CustomControl.IconButton)(target));
return;
case 5:
this.CustomPopup = ((System.Windows.Controls.Primitives.Popup)(target));
return;
case 6:
this.myButton = ((SWS.CustomControl.IconButton)(target));
return;
case 7:
this.RadGridView1 = ((Telerik.Windows.Controls.RadTreeListView)(target));
return;
}
this._contentLoaded = true;
}
}
}

120
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalNotice.g.cs
View File

@ -1,120 +0,0 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalNotice.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96F2D26AF189BFC9415C3A5E2A7E8B4F6F86E0A3BD2C2F7AAD40D4F0138BF2C9"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using Prism.DryIoc;
using Prism.Interactivity;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogSignalNotice
/// </summary>
public partial class DialogSignalNotice : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 77 "..\..\..\..\Views\DialogSignalManagements\DialogSignalNotice.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadGridView RadGridView2;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialogsignalmanagements/dialogsignalnotice.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\DialogSignalManagements\DialogSignalNotice.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.RadGridView2 = ((Telerik.Windows.Controls.RadGridView)(target));
return;
}
this._contentLoaded = true;
}
}
}

132
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalPropertyhisAndLogs.g.cs
View File

@ -1,132 +0,0 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BE60D5C45BFF53C850EE04B85D1AED3A70B5A4F94BFCB1E5612DE8D892E9C533"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using Prism.DryIoc;
using Prism.Interactivity;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogSignalPropertyhisAndLogs
/// </summary>
public partial class DialogSignalPropertyhisAndLogs : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 40 "..\..\..\..\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadGridView RadGridView1;
#line default
#line hidden
#line 89 "..\..\..\..\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadGridView RadGridView2;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialogsignalmanagements/dialogsignalpropertyhisandlogs.x" +
"aml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.RadGridView1 = ((Telerik.Windows.Controls.RadGridView)(target));
return;
case 2:
this.RadGridView2 = ((Telerik.Windows.Controls.RadGridView)(target));
return;
}
this._contentLoaded = true;
}
}
}

106
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalSelect.g.cs
View File

@ -1,106 +0,0 @@
#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalSelect.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE32C8B45FE374AABAE5ED09E93D91CDBA87B6F49A5282F213060672367234A0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using Prism.DryIoc;
using Prism.Interactivity;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogSignalSelect
/// </summary>
public partial class DialogSignalSelect : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialogsignalmanagements/dialogsignalselect.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\DialogSignalManagements\DialogSignalSelect.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
this._contentLoaded = true;
}
}
}

112
newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogTest.g.cs
View File

@ -1,112 +0,0 @@
#pragma checksum "..\..\..\Views\DialogTest.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6B3B7EEAB6D20917F0C5D3D89D2899E3CB2081B27EC6998F991166F325652220"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using SWS.CustomControl;
using SWS.WPF.Views;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// DialogTest
/// </summary>
public partial class DialogTest : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 19 "..\..\..\Views\DialogTest.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/dialogtest.xaml", System.UriKind.Relative);
#line 1 "..\..\..\Views\DialogTest.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.titleBar = ((SWS.CustomControl.customWindowTitleBar)(target));
return;
}
this._contentLoaded = true;
}
}
}

BIN
newFront/c#前端/SWS.WPF/obj/Debug/Views/Project.baml
View File

Binary file not shown.

108
newFront/c#前端/SWS.WPF/obj/Debug/Views/Project.g.cs
View File

@ -1,108 +0,0 @@
#pragma checksum "..\..\..\Views\Project.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CEE66C3694A40153FDD13BBA62FE1B6DC3D9D33F6B276CA567053423C05A4D66"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using SWS.CustomControl;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
using Telerik.Windows.Controls;
using Telerik.Windows.Controls.Animation;
using Telerik.Windows.Controls.Behaviors;
using Telerik.Windows.Controls.Carousel;
using Telerik.Windows.Controls.ComboBox;
using Telerik.Windows.Controls.Data.PropertyGrid;
using Telerik.Windows.Controls.DragDrop;
using Telerik.Windows.Controls.GridView;
using Telerik.Windows.Controls.LayoutControl;
using Telerik.Windows.Controls.Legend;
using Telerik.Windows.Controls.MultiColumnComboBox;
using Telerik.Windows.Controls.Primitives;
using Telerik.Windows.Controls.RadialMenu;
using Telerik.Windows.Controls.TransitionEffects;
using Telerik.Windows.Controls.TreeListView;
using Telerik.Windows.Controls.TreeView;
using Telerik.Windows.Controls.Wizard;
using Telerik.Windows.Data;
using Telerik.Windows.DragDrop;
using Telerik.Windows.DragDrop.Behaviors;
using Telerik.Windows.Input.Touch;
using Telerik.Windows.Shapes;
namespace SWS.WPF.Views {
/// <summary>
/// Project
/// </summary>
public partial class Project : System.Windows.Window, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/SWS.WPF;component/views/project.xaml", System.UriKind.Relative);
#line 1 "..\..\..\Views\Project.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
#line 13 "..\..\..\Views\Project.xaml"
((SWS.WPF.Views.Project)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
#line hidden
return;
}
this._contentLoaded = true;
}
}
}