change - 配置界面实现

SlnMesnac.Generate/Templates/Service/IServiceCreate.cs

@@ -33,7 +33,7 @@ namespace SlnMesnac.Generate.Templates.Service
 {
     public class IServiceCreate
     {
-        private static readonly string templateDir = @"F:\桌面\SlnMesnac\SlnMesnac.Generate\Templates\Service";
+        private static readonly string templateDir = @"C:\WorkSpace\Mesnac\RFID 展会软件\程序设计\RFID.Exhibition\SlnMesnac.Generate\Templates\Service";
 
         public bool Create(string tableName, string NameSpace, string outdir)
         {

SlnMesnac.Generate/Templates/Service/Impl/ServiceCreate.cs

@@ -33,7 +33,7 @@ namespace SlnMesnac.Generate.Templates.Service.Impl
 {
     public class ServiceCreate
     {
-        private static readonly string templateDir = @"F:\桌面\SlnMesnac\SlnMesnac.Generate\Templates\Service\Impl\";
+        private static readonly string templateDir = @"C:\WorkSpace\Mesnac\RFID 展会软件\程序设计\RFID.Exhibition\SlnMesnac.Generate\Templates\Service\Impl\";
 
         public bool Create(string tableName, string NameSpace, string outdir)
         {

SlnMesnac.Model/domain/base_product_describe.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace SlnMesnac.Model.domain
+{
+    ///<summary>
+    ///产品描述
+    ///</summary>
+    [SugarTable("base_product_describe"), TenantAttribute("iot")]
+    public partial class base_product_describe
+    {
+           public base_product_describe(){
+
+
+           }
+           /// <summary>
+           /// Desc:标识
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true,IsIdentity=true,ColumnName="objId")]
+           public int objid {get;set;}
+
+           /// <summary>
+           /// Desc:产品标识
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_code")]           
+           public string productCode {get;set;}
+
+           /// <summary>
+           /// Desc:描述标题
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="describe_title")]           
+           public string describeTitle {get;set;}
+
+           /// <summary>
+           /// Desc:描述内容
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="describe_content")]           
+           public string describeContent {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_by")]           
+           public string createdBy {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_time")]           
+           public DateTime? createdTime {get;set;}
+
+           /// <summary>
+           /// Desc:更新人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_by")]           
+           public string updatedBy {get;set;}
+
+           /// <summary>
+           /// Desc:更新时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_time")]           
+           public DateTime? updatedTime {get;set;}
+
+    }
+}

SlnMesnac.Model/domain/base_product_feature.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace SlnMesnac.Model.domain
+{
+    ///<summary>
+    ///产品特点
+    ///</summary>
+    [SugarTable("base_product_feature"), TenantAttribute("iot")]
+    public partial class base_product_feature
+    {
+           public base_product_feature(){
+
+
+           }
+           /// <summary>
+           /// Desc:标识
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true,IsIdentity=true,ColumnName="objId")]
+           public int objid {get;set;}
+
+           /// <summary>
+           /// Desc:产品标识
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_code")]           
+           public string productCode {get;set;}
+
+           /// <summary>
+           /// Desc:产品特点
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_feature")]           
+           public string productFeature {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_by")]           
+           public string createdBy {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_time")]           
+           public DateTime? createdTime {get;set;}
+
+           /// <summary>
+           /// Desc:更新人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_by")]           
+           public string updatedBy {get;set;}
+
+           /// <summary>
+           /// Desc:更新时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_time")]           
+           public DateTime? updatedTime {get;set;}
+
+    }
+}

SlnMesnac.Model/domain/base_product_info.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace SlnMesnac.Model.domain
+{
+    ///<summary>
+    ///产品信息
+    ///</summary>
+    [SugarTable("base_product_info"), TenantAttribute("iot")]
+    public partial class base_product_info
+    {
+           public base_product_info(){
+
+
+           }
+           /// <summary>
+           /// Desc:标识
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true,IsIdentity=true,ColumnName="objId")]
+           public int objid {get;set;}
+
+           /// <summary>
+           /// Desc:产品标识
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_code")]           
+           public string productCode {get;set;}
+
+           /// <summary>
+           /// Desc:产品系列
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_series")]           
+           public string productSeries {get;set;}
+
+           /// <summary>
+           /// Desc:产品名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_name")]           
+           public string productName {get;set;}
+
+           /// <summary>
+           /// Desc:产品特点
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_feature")]           
+           public string productFeature {get;set;}
+
+           /// <summary>
+           /// Desc:产品描述
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_describe")]           
+           public string productDescribe {get;set;}
+
+           /// <summary>
+           /// Desc:产品参数
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_param")]           
+           public string productParam {get;set;}
+
+           /// <summary>
+           /// Desc:产品尺寸
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_size")]           
+           public string productSize {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_by")]           
+           public string createdBy {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_time")]           
+           public DateTime? createdTime {get;set;}
+
+           /// <summary>
+           /// Desc:更新人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_by")]           
+           public string updatedBy {get;set;}
+
+           /// <summary>
+           /// Desc:更新时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_time")]           
+           public DateTime? updatedTime {get;set;}
+
+    }
+}

SlnMesnac.Model/domain/base_product_param.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace SlnMesnac.Model.domain
+{
+    ///<summary>
+    ///产品参数
+    ///</summary>
+    [SugarTable("base_product_param"), TenantAttribute("iot")]
+    public partial class base_product_param
+    {
+           public base_product_param(){
+
+
+           }
+           /// <summary>
+           /// Desc:标识
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true,IsIdentity=true,ColumnName="objId")]
+           public int objid {get;set;}
+
+           /// <summary>
+           /// Desc:产品标识
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="product_code")]           
+           public string productCode {get;set;}
+
+           /// <summary>
+           /// Desc:参数标题
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="param_title")]           
+           public string paramTitle {get;set;}
+
+           /// <summary>
+           /// Desc:参数内容
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="param_content")]           
+           public string paramContent {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_by")]           
+           public string createdBy {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="created_time")]           
+           public DateTime? createdTime {get;set;}
+
+           /// <summary>
+           /// Desc:更新人
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_by")]           
+           public string updatedBy {get;set;}
+
+           /// <summary>
+           /// Desc:更新时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>
+           [SugarColumn(ColumnName="updated_time")]           
+           public DateTime? updatedTime {get;set;}
+
+    }
+}

SlnMesnac.Repository/service/IBase_product_describeService.cs

@@ -0,0 +1,13 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service
+{
+    public interface Ibase_product_describeServices: IBaseService<base_product_describe>
+    {
+
+    }
+}

SlnMesnac.Repository/service/IBase_product_featureService.cs

@@ -0,0 +1,13 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service
+{
+    public interface Ibase_product_featureServices: IBaseService<base_product_feature>
+    {
+
+    }
+}

SlnMesnac.Repository/service/IBase_product_infoService.cs

@@ -0,0 +1,13 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service
+{
+    public interface Ibase_product_infoServices: IBaseService<base_product_info>
+    {
+
+    }
+}

SlnMesnac.Repository/service/IBase_product_paramService.cs

@@ -0,0 +1,13 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service
+{
+    public interface Ibase_product_paramServices: IBaseService<base_product_param>
+    {
+
+    }
+}

SlnMesnac.Repository/service/Impl/Base_product_describeServiceImpl.cs

@@ -0,0 +1,14 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class base_product_describeServiceImpl : BaseServiceImpl<base_product_describe>, Ibase_product_describeServices
+    {
+        public base_product_describeServiceImpl(Repository<base_product_describe> repository):base(repository)
+        {
+        }
+    }
+}

SlnMesnac.Repository/service/Impl/Base_product_featureServiceImpl.cs

@@ -0,0 +1,14 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class base_product_featureServiceImpl : BaseServiceImpl<base_product_feature>, Ibase_product_featureServices
+    {
+        public base_product_featureServiceImpl(Repository<base_product_feature> repository):base(repository)
+        {
+        }
+    }
+}

SlnMesnac.Repository/service/Impl/Base_product_infoServiceImpl.cs

@@ -0,0 +1,14 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class base_product_infoServiceImpl : BaseServiceImpl<base_product_info>, Ibase_product_infoServices
+    {
+        public base_product_infoServiceImpl(Repository<base_product_info> repository):base(repository)
+        {
+        }
+    }
+}

SlnMesnac.Repository/service/Impl/Base_product_paramServiceImpl.cs

@@ -0,0 +1,14 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class base_product_paramServiceImpl : BaseServiceImpl<base_product_param>, Ibase_product_paramServices
+    {
+        public base_product_paramServiceImpl(Repository<base_product_param> repository):base(repository)
+        {
+        }
+    }
+}

SlnMesnac.WPF/MainWindow.xaml

@@ -34,16 +34,26 @@
                         </StackPanel>
                     </Border>
                     <Border Grid.Column="2" Background="#0A56C7">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe669;" FontSize="22" Foreground="White" FontWeight="Bold"/>
-                            <TextBlock Text="首页" FontSize="22" Foreground="White" FontFamily="四圆黑" FontWeight="Bold" Margin="5,0"/>
-                        </StackPanel>
+                        <Button HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="60" Background="Transparent" BorderBrush="Transparent"
+                                x:Name="Index"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe669;" FontSize="22" Foreground="White" FontWeight="Bold"/>
+                                    <TextBlock Text="首页" FontSize="22" Foreground="White" FontFamily="四圆黑" FontWeight="Bold" Margin="5,0"/>
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
                     </Border>
                     <Border Grid.Column="3" Background="Transparent">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-                            <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xf018f;" FontSize="26" Foreground="White" FontWeight="Bold" Margin="0,1,0,0"/>
-                            <TextBlock Text="设置" FontSize="22" Foreground="White" FontWeight="Bold" Margin="5,0,20,0"/>
-                        </StackPanel>
+                        <Button HorizontalAlignment="Right" VerticalAlignment="Stretch" Height="60" Background="Transparent" BorderBrush="Transparent"
+                                x:Name="Set"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Set}">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xf018f;" FontSize="26" Foreground="White" FontWeight="Bold" Margin="0,1,0,0"/>
+                                    <TextBlock Text="设置" FontSize="22" Foreground="White" FontWeight="Bold" Margin="5,0,20,0"/>
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
                     </Border>
                 </Grid>
             </Border>

SlnMesnac.WPF/Page/Generate/GenerateControl.xaml

@@ -18,11 +18,11 @@
         <Border Grid.Row="0" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                 
-                <TextBlock Text="数据库连接:" FontSize="20" Foreground="White" VerticalAlignment="Center" Margin="10,0,10,0"/>
+                <TextBlock Text="数据库连接:" FontSize="20" Foreground="Black" VerticalAlignment="Center" Margin="10,0,10,0"/>
                 <ComboBox Width="200" Height="35" FontSize="18" VerticalAlignment="Center" Name="comboBox1" ItemsSource="{Binding Options}" SelectedItem="{Binding SelectedOption, Mode=TwoWay}" DisplayMemberPath="."/>
 
-                <TextBlock Text="表名:" FontSize="20" Foreground="White" VerticalAlignment="Center" Margin="30,0,10,0"/>
-                <TextBox x:Name="queryParam" Foreground="White" FontSize="18" Width="200" Height="35"/>
+                <TextBlock Text="表名:" FontSize="20" Foreground="Black" VerticalAlignment="Center" Margin="30,0,10,0"/>
+                <TextBox x:Name="queryParam" Foreground="Black" FontSize="18" Width="200" Height="35"/>
 
                 <Button Content="查  询" FontSize="16"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QuerySearchCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" />
 
@@ -30,11 +30,11 @@
         </Border>
         <Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
             <DataGrid x:Name="datagrid" Grid.Row="0" ItemsSource="{Binding TablesDataGrid}" Background="Transparent" 
-                FontSize="15" ColumnHeaderHeight="35" 
-                RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                FontSize="15" ColumnHeaderHeight="50" 
+                RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
                 GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                 ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
-                Foreground="#FFFFFF" >
+                Foreground="Black" >
                 <!--resourceStyle 399行修改选中字体颜色-->
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding Name}" Header="表名" Width="3*" IsReadOnly="True"/>

SlnMesnac.WPF/Page/IndexControl.xaml

@@ -9,7 +9,7 @@
     <UserControl.Resources>
         
     </UserControl.Resources>
-    <Grid>
+    <Grid Cursor="">
         <Grid.Background>
             <ImageBrush ImageSource="/Templates/image/background.jpg" />
         </Grid.Background>
@@ -63,7 +63,7 @@
         </Border>
         <Border Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="2">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,0,0,10">
-                <TextBlock Text="I68" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
+                <TextBlock Text="RFR-RFLY" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
                 <TextBox FontSize="18" Foreground="Black" Width="150" Height="30"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="读取" Command="{Binding ControlOnClickCommand}" Foreground="White" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="70" Height="30" Background="#194B9F" BorderBrush="#194B9F" Margin="5,5"/>
@@ -73,7 +73,7 @@
         </Border>
         <Border Grid.Row="0" Grid.Column="6" >
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10">
-                <TextBlock Text="I68" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
+                <TextBlock Text="I90" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
                 <TextBox FontSize="18" Foreground="Black" Width="150" Height="30"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="读取" Command="{Binding ControlOnClickCommand}" Foreground="White" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="70" Height="30" Background="#194B9F" BorderBrush="#194B9F" Margin="5,5"/>
@@ -81,9 +81,10 @@
                 </StackPanel>
             </StackPanel>
         </Border>
+
         <Border Grid.Row="3" Grid.Column="2">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,10">
-                <TextBlock Text="I68" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
+                <TextBlock Text="050-B" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
                 <TextBox FontSize="18" Foreground="Black" Width="150" Height="30"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="读取" Command="{Binding ControlOnClickCommand}" Foreground="White" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="70" Height="30" Background="#194B9F" BorderBrush="#194B9F" Margin="5,5"/>
@@ -93,7 +94,7 @@
         </Border>
         <Border Grid.Row="3" Grid.Column="4">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,10">
-                <TextBlock Text="I68" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
+                <TextBlock Text="RFR-050" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
                 <TextBox FontSize="18" Foreground="Black" Width="150" Height="30"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="读取" Command="{Binding ControlOnClickCommand}" Foreground="White" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="70" Height="30" Background="#194B9F" BorderBrush="#194B9F" Margin="5,5"/>
@@ -103,7 +104,7 @@
         </Border>
         <Border Grid.Row="3" Grid.Column="6">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10">
-                <TextBlock Text="I68" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
+                <TextBlock Text="I40" FontSize="22" Foreground="Black" FontWeight="Bold" HorizontalAlignment="Center"/>
                 <TextBox FontSize="18" Foreground="Black" Width="150" Height="30"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="读取" Command="{Binding ControlOnClickCommand}" Foreground="White" Style="{StaticResource MaterialDesignFlatMidBgButton}" Width="70" Height="30" Background="#194B9F" BorderBrush="#194B9F" Margin="5,5"/>
@@ -111,5 +112,30 @@
                 </StackPanel>
             </StackPanel>
         </Border>
+
+        <!--<Border Grid.Row="1" Grid.Column="1">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="90" Height="80"  HorizontalAlignment="Center" VerticalAlignment="Top" Margin="45,-5,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>
+        <Border Grid.Row="1" Grid.Column="3">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="90" Height="80" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40,15,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>
+        <Border Grid.Row="0" Grid.Column="5">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="100" Height="85" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40,80,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>
+        <Border Grid.Row="3" Grid.Column="1">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="90" Height="80" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="45,50,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>
+        <Border Grid.Row="3" Grid.Column="3">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="85" Height="130" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="35,30,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>
+        <Border Grid.Row="3" Grid.Column="5">
+            <Button Background="Transparent" BorderBrush="Transparent" Width="100" Height="95" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40,50,10,10"
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+        </Border>-->
     </Grid>
 </UserControl>

SlnMesnac.WPF/Page/IndexControl.xaml.cs

@@ -1,4 +1,5 @@
 using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.Index;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,9 +23,11 @@ namespace SlnMesnac.WPF.Page
     [RegisterAsSingletonAttribute]
     public partial class IndexControl : UserControl
     {
-        public IndexControl()
+        public IndexControl(IndexViewModel indexViewModel)
         {
             InitializeComponent();
+
+            this.DataContext = indexViewModel;
         }
     }
 }

SlnMesnac.WPF/Page/ProductDetails/DetailsEditControl.xaml

@@ -22,18 +22,28 @@
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="3*"/>
-                            <ColumnDefinition Width="7*"/>
+                            <ColumnDefinition Width="5*"/>
+                            <ColumnDefinition Width="2*"/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.Column="0" Background="Transparent" BorderBrush="#5B93EA" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
 
                         <Border Grid.Column="1" Background="Transparent" CornerRadius="3" Margin="10,10">
                             <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,10,0,0">
                                 <Border Background="#1052AE" CornerRadius="5,5,5,0" Width="400" Height="40">
-                                    <TextBlock Text="无线射频识别RFID HW-RFR-050系列" Foreground="White" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                    <TextBox Text="无线射频识别RFID HW-RFR-050系列" Foreground="White" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"/>
                                 </Border>
-                                <TextBlock Text="HW-RFR-050-B-003-1204S" Foreground="Black" FontSize="24" Margin="0,20"/>
+                                <TextBox Text="HW-RFR-050-B-003-1204S" Foreground="Black" FontSize="24" Margin="0,20"/>
 
                                 <Border Background="#E6EDF6" CornerRadius="5" Width="150" Height="40" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/>
+
+                            </StackPanel>
+                        </Border>
+
+                        <Border Grid.Column="2" Background="Transparent" CornerRadius="3" Margin="10,10">
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,10,0,0">
+                                <Button Content="保存" Command="{Binding SavePrdouctInfoCommand }"/>
+                                
+                                <Button Content="添加" Margin="0,10,0,0"/>
                             </StackPanel>
                         </Border>
                     </Grid>
@@ -45,35 +55,31 @@
                             <ColumnDefinition Width="3*"/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.Column="1" Background="Transparent" BorderBrush="#5B93EA" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
-
-                        <!--<Border Grid.Column="0" Background="Transparent" CornerRadius="3" Margin="10,10">
-                            
-                        </Border>-->
                         <StackPanel Grid.Column="0" Width="600" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,10,0,0">
                             <Border Background="#E6EDF6" CornerRadius="18"  Height="40" Margin="0,10">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe61d;" Foreground="#1550B7" FontSize="22" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                    <TextBlock Text="体积小，三防性能优。" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                    <TextBox  Text="{Binding ProductFeature[0].productFeature}" Width="500" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Border>
 
                             <Border Background="#E6EDF6" CornerRadius="18"  Height="40" Margin="0,10">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe61d;" Foreground="#1550B7" FontSize="22" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                                    <TextBlock Text="远距稳定识别。" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                    <TextBox Text="{Binding ProductFeature[1].productFeature}" Width="500" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Border>
                         </StackPanel>
                     </Grid>
                 </Border>
                 <Border Grid.Row="2" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10">
-                    <Grid>
+                    <Grid Margin="10,10,10,0">
                         <Grid.RowDefinitions>
                             <RowDefinition/>
                             <RowDefinition/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <Border Grid.Row="0" BorderBrush="Green" BorderThickness="1">
+                        <Border Grid.Row="0" BorderBrush="Green" BorderThickness="0">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="3*"/>
@@ -86,14 +92,53 @@
                                             <GradientStop Color="#FFFFFF" Offset="1.0"/>
                                         </LinearGradientBrush>
                                     </Border.Background>
-                                    <TextBlock Text="小尺寸" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                    <TextBox Text="{Binding ProductDescribe[0].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
                                 </Border>
-                                <TextBlock  Grid.Row="1" Text="       HW-RFR-050-B-XX高频读写器的尺寸为39.8*72*13mm，其可以固定在设计尺寸小的位
-置。如辊轴输送线的辊轴与辊轴的中间缝隙，可以用来识别底部托盘标签。" TextWrapping="Wrap" FontSize="20" LineHeight="10"/>
+                                <TextBox  Grid.Row="1" Text="{Binding ProductDescribe[0].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18"/>
+                            </Grid>
+                        </Border>
+
+                        <Border Grid.Row="1" BorderBrush="Green" BorderThickness="0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="3*"/>
+                                    <RowDefinition Height="6*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Color="#D3DCF4" Offset="0.0"/>
+                                            <GradientStop Color="#FFFFFF" Offset="1.0"/>
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <TextBox Text="{Binding ProductDescribe[1].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                </Border>
+                                <TextBox  Grid.Row="1" Text="{Binding ProductDescribe[1].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18" />
+                            </Grid>
+                        </Border>
+
+                        <Border Grid.Row="2" BorderBrush="Green" BorderThickness="0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="3*"/>
+                                    <RowDefinition Height="6*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Color="#D3DCF4" Offset="0.0"/>
+                                            <GradientStop Color="#FFFFFF" Offset="1.0"/>
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <TextBox Text="{Binding ProductDescribe[2].describeTitle}" Width="300" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                </Border>
+                                <TextBox  Grid.Row="1" Text="{Binding ProductDescribe[2].describeContent}" Width="800" TextWrapping="Wrap" FontSize="18"/>
                             </Grid>
                         </Border>
                     </Grid>
                 </Border>
+
+
             </Grid>
         </Border>
 
@@ -102,11 +147,108 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="4.5*"/>
                     <RowDefinition Height="6*"/>
-                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="4*"/>
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
-                <Border Grid.Row="1" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
-                <Border Grid.Row="2" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
+                <Border Grid.Row="1" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10" >
+                    <Grid Margin="10,0,10,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="9*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+
+                        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                            <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                <TextBlock Text="技术参数" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                            </Border>
+                        </Border>
+                        <Border Grid.Row="1" Grid.Column="0">
+                            <!--<StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" x:Name="ParameterStackPanelLeft">
+                                <TextBox Text="射频协议：符合ISO/IEC 15693" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="协议工作频率：13.56MHz士7KHz" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="识别距离：小于等于50mm" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="盘点速度：20ms/次" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+
+                                <TextBox Text="输入电压：12-24VDC" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="发射功率:0.2W" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="最大功率：1W" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="通讯协议：Modbus RTU" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="通讯接口：RS485（M12-5针-B型-公头航空头）" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                            </StackPanel>-->
+
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" x:Name="ParameterStackPanelLeft">
+                                <TextBox Text="{Binding ProductParams[0].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[1].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[2].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[3].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+
+                                <TextBox Text="{Binding ProductParams[4].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[5].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[6].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[7].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[8].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                            </StackPanel>
+                        </Border>
+                        <Border Grid.Row="1" Grid.Column="1">
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" x:Name="ParameterStackPanelRight">
+                                <TextBox Text="{Binding ProductParams[9].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[10].paramContent}" Width="380" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[11].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[12].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+
+                                <TextBox Text="{Binding ProductParams[13].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[14].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[15].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[16].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBox Text="{Binding ProductParams[17].paramContent}" Width="380" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                            </StackPanel>
+                        </Border>
+
+                    </Grid>
+                </Border>
+                <Border Grid.Row="2" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" CornerRadius="3" Margin="10,10">
+                    <Grid>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="0" Background="White" BorderBrush="White" BorderThickness="2" Margin="0,0,5,0">
+                            <Grid Margin="10,0,10,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="2*"/>
+                                    <RowDefinition Height="9*"/>
+                                </Grid.RowDefinitions>
+
+                                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                                    <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                        <TextBlock Text="产品尺寸（mm）" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                    </Border>
+                                </Border>
+
+                            </Grid>
+                        </Border>
+                        <Border Grid.Column="1" Background="White" BorderBrush="White" BorderThickness="2" Margin="5,0,0,0">
+                            <Grid Margin="10,0,10,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="2*"/>
+                                    <RowDefinition Height="9*"/>
+                                </Grid.RowDefinitions>
+
+                                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                                    <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                        <TextBlock Text="产品尺寸（mm）" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                    </Border>
+                                </Border>
+
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </Border>
             </Grid>
         </Border>
     </Grid>

SlnMesnac.WPF/Page/ProductDetails/DetailsEditControl.xaml.cs

@@ -1,4 +1,5 @@
 using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.ProductDetails;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,9 +24,15 @@ namespace SlnMesnac.WPF.Page.ProductDetails
     [RegisterAsSingletonAttribute]
     public partial class DetailsEditControl : UserControl
     {
-        public DetailsEditControl()
+        public DetailsEditControl(ProductDetailsEditViewModel productDetailsEditViewModel)
         {
             InitializeComponent();
+
+            this.DataContext = productDetailsEditViewModel;
         }
+
+        
     }
+
+
 }

SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml

@@ -5,8 +5,231 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SlnMesnac.WPF.Page.ProductDetails"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-            
+             d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
+    <Grid  Margin="5,10">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Border Grid.Column="0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="5*"/>
+                </Grid.RowDefinitions>
+                <Border Grid.Row="0" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="3*"/>
+                            <ColumnDefinition Width="7*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="0" Background="Transparent" BorderBrush="#5B93EA" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
+
+                        <Border Grid.Column="1" Background="Transparent" CornerRadius="3" Margin="10,10">
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,10,0,0">
+                                <Border Background="#1052AE" CornerRadius="5,5,5,0" Width="400" Height="40">
+                                    <TextBlock Text="无线射频识别RFID HW-RFR-050系列" Foreground="White" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                </Border>
+                                <TextBlock Text="HW-RFR-050-B-003-1204S" Foreground="Black" FontSize="24" Margin="0,20"/>
+
+                                <Border Background="#E6EDF6" CornerRadius="5" Width="150" Height="40" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/>
+                            </StackPanel>
+                        </Border>
+                    </Grid>
+                </Border>
+                <Border Grid.Row="1" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="7*"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="1" Background="Transparent" BorderBrush="#5B93EA" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
+                        <StackPanel Grid.Column="0" Width="600" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,10,0,0">
+                            <Border Background="#E6EDF6" CornerRadius="18"  Height="40" Margin="0,10">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe61d;" Foreground="#1550B7" FontSize="22" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                    <TextBlock Text="体积小，三防性能优。" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </Border>
+
+                            <Border Background="#E6EDF6" CornerRadius="18"  Height="40" Margin="0,10">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock FontFamily="/Templates/fonts/font_5w2octy6l1q/#iconfont" Text="&#xe61d;" Foreground="#1550B7" FontSize="22" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                                    <TextBlock Text="远距稳定识别。" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </Border>
+                        </StackPanel>
+                    </Grid>
+                </Border>
+                <Border Grid.Row="2" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10">
+                    <Grid Margin="10,10,10,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Border Grid.Row="0" BorderBrush="Green" BorderThickness="0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="3*"/>
+                                    <RowDefinition Height="6*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Color="#D3DCF4" Offset="0.0"/>
+                                            <GradientStop Color="#FFFFFF" Offset="1.0"/>
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <TextBlock Text="小尺寸" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                </Border>
+                                <TextBlock  Grid.Row="1" Text="       HW-RFR-050-B-XX高频读写器的尺寸为39.8*72*13mm，其可以固定在设计尺寸小的位
+置。如辊轴输送线的辊轴与辊轴的中间缝隙，可以用来识别底部托盘标签。" TextWrapping="Wrap" FontSize="18" LineHeight="10"/>
+                            </Grid>
+                        </Border>
+
+                        <Border Grid.Row="1" BorderBrush="Green" BorderThickness="0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="3*"/>
+                                    <RowDefinition Height="6*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Color="#D3DCF4" Offset="0.0"/>
+                                            <GradientStop Color="#FFFFFF" Offset="1.0"/>
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <TextBlock Text="三防性能优" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                </Border>
+                                <TextBlock  Grid.Row="1" Text="       高频读写器具备IP67的防护等级。可以满足恶劣的工业环境的应用。" TextWrapping="Wrap" FontSize="18" LineHeight="10"/>
+                            </Grid>
+                        </Border>
+
+                        <Border Grid.Row="2" BorderBrush="Green" BorderThickness="0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="3*"/>
+                                    <RowDefinition Height="6*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Color="#D3DCF4" Offset="0.0"/>
+                                            <GradientStop Color="#FFFFFF" Offset="1.0"/>
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                    <TextBlock Text="远距离识别" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                </Border>
+                                <TextBlock  Grid.Row="1" Text="       HW-RFR-050高频读写器可以稳定识别距离为0-45mm，最大识别距离为65mm-70mm，根据标签的选型以及天线的尺寸有所变化。" TextWrapping="Wrap" FontSize="18" LineHeight="10"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </Border>
+
+
+            </Grid>
+        </Border>
+
+        <Border Grid.Column="1">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="4.5*"/>
+                    <RowDefinition Height="6*"/>
+                    <RowDefinition Height="4*"/>
+                </Grid.RowDefinitions>
+                <Border Grid.Row="0" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10"></Border>
+                <Border Grid.Row="1" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="3" Margin="10,10">
+                    <Grid Margin="10,0,10,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="9*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+
+                        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                            <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                <TextBlock Text="技术参数" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                            </Border>
+                        </Border>
+                        <Border Grid.Row="1" Grid.Column="0">
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left">
+                                <TextBlock Text="RFID特性" Foreground="#1550B7" FontSize="16" TextWrapping="Wrap" Margin="0,10,0,0"/>
+                                <TextBlock Text="射频协议：符合ISO/IEC 15693" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="协议工作频率：13.56MHz士7KHz" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="识别距离：小于等于50mm" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="盘点速度：20ms/次" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+
+                                <TextBlock Text="输入电压：12-24VDC" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="发射功率:0.2W" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="最大功率：1W" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="通讯协议：Modbus RTU" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="通讯接口：RS485（M12-5针-B型-公头航空头）" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="搭配网关支持通讯协议：Profinet、EtherNet/IP、EtherCAT、CCLinkIE、ModbusTCP" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                            </StackPanel>
+                        </Border>
+                        <Border Grid.Row="1" Grid.Column="1">
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left">
+                                <TextBlock Text="RFID特性" Foreground="#1550B7" FontSize="16" TextWrapping="Wrap" Margin="0,10,0,0"/>
+                                <TextBlock Text="尺寸：40（W） *72 （L）*13（H）mm" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="外壳材质:ABS+PC" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="安装环境：安装需要1cm厚的无金属缓冲区，如垫一块10mm厚pom板" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="尾部出线长度：300mm" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+
+                                <TextBlock Text="工作温度：-10℃～+65℃" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="防护等级：IP67" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="一致性认证：CE、Rohs" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                                <TextBlock Text="功能显示：通讯正常：Link指示灯常亮。有通讯：Mod指示灯闪烁" Foreground="Gray" FontSize="14" TextWrapping="Wrap" Margin="0,5,0,0"/>
+                            </StackPanel>
+                        </Border>
+
+                    </Grid>
+                </Border>
+                <Border Grid.Row="2" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" CornerRadius="3" Margin="10,10">
+                    <Grid>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="0" Background="White" BorderBrush="White" BorderThickness="2" Margin="0,0,5,0">
+                            <Grid Margin="10,0,10,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="2*"/>
+                                    <RowDefinition Height="9*"/>
+                                </Grid.RowDefinitions>
+
+                                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                                    <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                        <TextBlock Text="产品尺寸（mm）" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                    </Border>
+                                </Border>
+
+                            </Grid>
+                        </Border>
+                        <Border Grid.Column="1" Background="White" BorderBrush="White" BorderThickness="2" Margin="5,0,0,0">
+                            <Grid Margin="10,0,10,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="2*"/>
+                                    <RowDefinition Height="9*"/>
+                                </Grid.RowDefinitions>
+
+                                <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                                    <Border Grid.Row="0" BorderBrush="#1352B2" BorderThickness="10,0,0,0">
+                                        <TextBlock Text="产品尺寸（mm）" Foreground="#1550B7" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="20,0,0,0"/>
+                                    </Border>
+                                </Border>
+
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
     </Grid>
 </UserControl>

SlnMesnac.WPF/ViewModel/Index/IndexViewModel.cs

@@ -0,0 +1,34 @@
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.VisualBasic;
+using SlnMesnac.Serilog;
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SlnMesnac.WPF.ViewModel.Index
+{
+    [RegisterAsSingletonAttribute]
+    public partial class IndexViewModel : BaseViewModel
+    {
+        public readonly SerilogHelper _logger;
+
+        public IndexViewModel(SerilogHelper logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 加载产品信息
+        /// </summary>
+        /// <param name="deviceCode"></param>
+        [RelayCommand]
+        private void LoadProductInfo(string deviceCode)
+        {
+            string code = deviceCode as string;
+        }
+    }
+}

SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs

@@ -64,7 +64,7 @@ namespace SlnMesnac.WPF.ViewModel
             _generateControl = generateControl;
             _indexControl = indexControl;
             _detailsEditControl = detailsEditControl;
-            this.UserContent = _detailsEditControl;
+            this.UserContent = _generateControl;
         }
 
         /// <summary>
@@ -125,7 +125,18 @@ namespace SlnMesnac.WPF.ViewModel
             try
             {
                 string info = obj as string;
-                //UserContent = inStoreInfoControl;
+                switch (info)
+                {
+                    case "Index":
+                        UserContent = _indexControl;
+                        break;
+                    case "Set":
+                        UserContent = _detailsEditControl;
+                        break;
+                    default:
+                        UserContent = _indexControl;
+                        break;
+                }
             }
             catch (Exception ex)
             {

SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs

@@ -0,0 +1,72 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SlnMesnac.Model.domain;
+using SlnMesnac.WPF.Attribute;
+using SlnMesnac.WPF.ViewModel.Base;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SlnMesnac.WPF.ViewModel.ProductDetails
+{
+    [RegisterAsSingletonAttribute]
+    public partial class ProductDetailsEditViewModel : BaseViewModel
+    {
+
+        [ObservableProperty]
+        public ObservableCollection<base_product_feature> productFeature = new ObservableCollection<base_product_feature>();
+
+        [ObservableProperty]
+        public ObservableCollection<base_product_describe> productDescribe = new ObservableCollection<base_product_describe>();
+
+        [ObservableProperty]
+        public ObservableCollection<base_product_param> productParams = new ObservableCollection<base_product_param>();
+
+
+        public ProductDetailsEditViewModel()
+        {
+            Init();
+        }
+
+
+        private void Init()
+        {
+            for(int i = 0; i < 2; i++)
+            {
+                ProductFeature.Add(new base_product_feature()
+                {
+                    productFeature = string.Empty
+                });
+            }
+
+            for (int i = 0; i < 3; i++)
+            {
+                ProductDescribe.Add(new base_product_describe()
+                {
+                    describeTitle = string.Empty,
+                    describeContent = string.Empty
+                });
+            }
+            for (int i = 0; i < 19; i++)
+            {
+                ProductParams.Add(new base_product_param()
+                {
+                    paramContent = string.Empty,
+                });
+            }
+        }
+
+        [RelayCommand]
+        private void SavePrdouctInfo()
+        {
+            var productFeatureInfo = ProductFeature;
+
+            var productDescribeInfo = ProductDescribe;
+
+            var productParamsInfo = ProductParams;
+        }
+    }
+}

SlnMesnac.WPF/appsettings.json

@@ -11,14 +11,10 @@
     "logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
     "SqlConfig": [
       {
-        "configId": "mes",
-        "dbType": 1,
-        "connStr": "server=.;uid=sa;pwd=123456;database=JiangYinMENS"
-      },
-      {
-        "configId": "mcs",
-        "dbType": 3,
-        "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma"
+        "configId": "iot",
+        "dbType": 0,
+        "isFlag": true,
+        "connStr": "server=1.13.177.47;Port=3306;Database=rfid_exhibition;Uid=root;Pwd=Haiwei123456;"
       }
     ],
     "PlcConfig": [