style - 修改Icon

SlnMesnac.WPF/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.WPF"
         mc:Ignorable="d"
-        Title="汇集软件"  WindowStartupLocation="CenterScreen" WindowState="Maximized" Height="1020" Width="1420" Topmost="False" Loaded="Window_Loaded" Closing="Window_Closing" Icon="/Highway.ico">
+        Title="新宝龙输送带RFID数字化系统"  WindowStartupLocation="CenterScreen" WindowState="Maximized" Height="1020" Width="1420" Topmost="False" Loaded="Window_Loaded" Closing="Window_Closing" Icon="/NOVOTON.ico">
     <!--<Window.Background>
         <ImageBrush ImageSource="/Templates/image/background.jpg" />
     </Window.Background>-->

SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml

@@ -175,7 +175,7 @@
                                 <DataGridTextColumn Binding="{Binding serialno}" Header="写入编号" Width="0.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding orderno}" Header="订单号" Width="1.2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding lineno}" Header="产线号" Width="0.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTextColumn Binding="{Binding producttype}" Header="产品类型" Width="2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <!--<DataGridTextColumn Binding="{Binding producttype}" Header="产品类型" Width="2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />-->
                                 <DataGridTextColumn Binding="{Binding rfidepc}" Header="原始EPC" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding rfidascii}" Header="写入的RFID编码" Width="2*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding readtime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="读取时间" Width="1.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>

SlnMesnac.WPF/SlnMesnac.WPF.csproj

@@ -7,28 +7,31 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <ApplicationIcon>Templates\icon\Highway.ico</ApplicationIcon>
+    <ApplicationIcon>Templates\icon\NOVOTON.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="appsettings.json" />
-    <None Remove="Highway.ico" />
     <None Remove="Icon.png" />
+    <None Remove="NOVOTON.ico" />
     <None Remove="Templates\image\background.jpg" />
-    <None Remove="Templates\image\between.png" />
+    <None Remove="Templates\image\新宝龙logo底版透明.png" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Include="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Templates\icon\Highway.ico" />
+    <Content Include="Templates\icon\NOVOTON.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\icon\NOVOTON.ico" />
+    <Content Include="Templates\image\新宝龙logo底版透明.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Highway.ico" />
     <Resource Include="Icon.png" />
-    <Resource Include="Templates\image\between.png" />
+    <Resource Include="NOVOTON.ico" />
   </ItemGroup>
 
   <ItemGroup>