SCADA_DAQ.Plugin.Tailg/Env.cs

@@ -25,8 +25,8 @@ namespace SCADA_DAQ.Plugin.Tailg
         public static DILDB DAL = null;
 
         // SQL Server
-        public static SqlSchema.DIL.DILDB SgIDAL = new SqlSchema.DIL.DILDB("127.0.0.1", "TL_DB", "sa", "M+123456");
-        //public static SqlSchema.DIL.DILDB SgIDAL = new SqlSchema.DIL.DILDB(@"10.255.254.250", "TL_DB", "sa", "M+123456");
+        //public static SqlSchema.DIL.DILDB SgIDAL = new SqlSchema.DIL.DILDB("127.0.0.1", "TL_DB", "sa", "M+123456");
+        public static SqlSchema.DIL.DILDB SgIDAL = new SqlSchema.DIL.DILDB(@"10.255.254.250", "TL_DB", "sa", "M+123456");
 
 
         public static bool EnvInitFinish = false;

SCADA_DAQ/Customer/Models/ParameterSettingsModel.cs

@@ -6,6 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Shapes;
 using DBNames;
+using Opc.Ua;
+using System.Windows;
+using SCADA_DAQ.Customer.Models.ProductionLineManagement;
 
 namespace SCADA_DAQ.Customer.Models
 {
@@ -16,7 +19,7 @@ namespace SCADA_DAQ.Customer.Models
         /// <summary>
         /// 产线编号
         /// </summary>  
-        [AutoViewProperty("产线ID",Icon = "MessageTextOutline")]
+        [AutoViewProperty("产线号",Icon = "MessageTextOutline")]
         //[Column(T_Col_Name.APP_TaiLing_ProductionLineConfig.ProductionLineId_Str)]
         public string ProductionLineId  
         {
@@ -33,8 +36,6 @@ namespace SCADA_DAQ.Customer.Models
         private string _ProductionLineId;
 
 
-
-       
         private string _ProductionLineName;
         /// <summary>
         /// 产线名称
@@ -53,13 +54,13 @@ namespace SCADA_DAQ.Customer.Models
                 }
             }
         }
-
+        
 
         private string _ProductionLineShortName;
         /// <summary>
         /// 简称
         /// </summary>
-        [AutoViewProperty("产线简称", Icon = "MessageTextOutline")]
+        [AutoViewProperty("产线简称", Icon = "MessageTextOutline", Visibility = Visibility.Collapsed)]
         //[Column(T_Col_Name.APP_TaiLing_ProductionLineConfig.ProductionLineShortName_Str)]
         public string ProductionLineShortName
         {
@@ -74,11 +75,10 @@ namespace SCADA_DAQ.Customer.Models
             }
         }
 
-
         /// <summary>
         /// 产线负责人
         /// </summary>
-        [AutoViewProperty("产线负责人", Icon = "MessageTextOutline")]
+        [AutoViewProperty("产线负责人", Icon = "MessageTextOutline", Visibility = Visibility.Collapsed)]
         //[Column(T_Col_Name.APP_TaiLing_ProductionLineConfig.ProductionLineAdministrator_Str)]
        public string ProductionLineAdministrator
         {
@@ -98,7 +98,7 @@ namespace SCADA_DAQ.Customer.Models
         /// <summary>
         /// 产线人数
         /// </summary>
-        [AutoViewProperty("产线人数", Icon = "MessageTextOutline")]
+        [AutoViewProperty("产线人数", Icon = "MessageTextOutline", Visibility = Visibility.Collapsed)]
         //[Column(T_Col_Name.APP_TaiLing_ProductionLineConfig.NumberOfPeople_Int)]
         public int NumberOfPeople
         {

SCADA_DAQ/Customer/UctFrmParameterSet.xaml.cs

@@ -34,13 +34,13 @@ namespace SCADA_DAQ.Customer
         {
             InitializeComponent();
             ToolBar.Visibility=Visibility.Collapsed;
-            ParameterSettings.Content = new AutoView(CustomerEnv.ProductionLineConfigValue, new string[]
-            {
-                nameof(ParameterSettingsModel.WorkShopId),
-                nameof(ParameterSettingsModel.ProductionLineId),
-                nameof(ParameterSettingsModel.PlcName)
-            })
-            //ParameterSettings.Content = new AutoView(CustomerEnv.ProductionLineConfigValue)
+            //ParameterSettings.Content = new AutoView(CustomerEnv.ProductionLineConfigValue, new string[]
+            //{
+            //    nameof(ParameterSettingsModel.WorkShopId),
+            //    nameof(ParameterSettingsModel.ProductionLineId),
+            //    nameof(ParameterSettingsModel.PlcName)
+            //})
+            ParameterSettings.Content = new AutoView(CustomerEnv.ProductionLineConfigValue)
             { MaxTitleWidth = 150 };
 
         }