临时提交

Lib/SCADA.CommonCtrl.xml

@@ -2821,30 +2821,6 @@
             </summary>
             <param name="e"></param>
         </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegEditView._pressDispatcherTimer">
-            <summary>
-            DispatcherTimer to listen whether the button is long clicked.
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegEditView.OnDispatcherTimeOut(System.Object,System.EventArgs)">
-            <summary>
-            
-            </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegEditView.OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs)">
-            <summary>
-            
-            </summary>
-            <param name="e"></param>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegEditView.OnMouseLeftButtonUp(System.Windows.Input.MouseButtonEventArgs)">
-            <summary>
-            
-            </summary>
-            <param name="e"></param>
-        </member>
         <member name="T:SCADA.CommonCtrl.SCADAUI.RegReadingView">
             <summary>
             
@@ -20374,5 +20350,35 @@
             <param name="name">The name of the value</param>
             <returns>The enum value</returns>
         </member>
+        <member name="T:XamlGeneratedNamespace.GeneratedInternalTypeHelper">
+            <summary>
+            GeneratedInternalTypeHelper
+            </summary>
+        </member>
+        <member name="M:XamlGeneratedNamespace.GeneratedInternalTypeHelper.CreateInstance(System.Type,System.Globalization.CultureInfo)">
+            <summary>
+            CreateInstance
+            </summary>
+        </member>
+        <member name="M:XamlGeneratedNamespace.GeneratedInternalTypeHelper.GetPropertyValue(System.Reflection.PropertyInfo,System.Object,System.Globalization.CultureInfo)">
+            <summary>
+            GetPropertyValue
+            </summary>
+        </member>
+        <member name="M:XamlGeneratedNamespace.GeneratedInternalTypeHelper.SetPropertyValue(System.Reflection.PropertyInfo,System.Object,System.Object,System.Globalization.CultureInfo)">
+            <summary>
+            SetPropertyValue
+            </summary>
+        </member>
+        <member name="M:XamlGeneratedNamespace.GeneratedInternalTypeHelper.CreateDelegate(System.Type,System.Object,System.String)">
+            <summary>
+            CreateDelegate
+            </summary>
+        </member>
+        <member name="M:XamlGeneratedNamespace.GeneratedInternalTypeHelper.AddEventHandler(System.Reflection.EventInfo,System.Object,System.Delegate)">
+            <summary>
+            AddEventHandler
+            </summary>
+        </member>
     </members>
 </doc>

Lib/SCADA.CommonLib.xml

@@ -86,40 +86,6 @@
             
             </summary>
         </member>
-        <member name="T:SCADA.CommonLib.AutoViewModelAttribute">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.AutoViewModelAttribute.#ctor(System.String,System.Int32,System.Windows.Controls.Orientation,System.Windows.Controls.Orientation)">
-            <summary>
-            
-            </summary>
-            <param name="title"></param>
-            <param name="columnCount"></param>
-            <param name="orentation"></param>
-            <param name="itemLayoutOrientation"></param>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewModelAttribute.Title">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewModelAttribute.Orientation">
-            <summary>
-            布局方向
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewModelAttribute.ColumnCount">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewModelAttribute.ItemLayoutOrientation">
-            <summary>
-            子项目的布局方向
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.AutoViewPropertyAttribute">
             <summary>
             
@@ -175,21 +141,6 @@
             当子控件是集合时,控件内部有几列
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.AutoViewPropertyAttribute.InnerOrientation">
-            <summary>
-            当子控件是集合时,控件内部的摆放方向
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewPropertyAttribute.TextWrapping">
-            <summary>
-            换行模式
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoViewPropertyAttribute.Visibility">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="P:SCADA.CommonLib.AutoViewPropertyAttribute.Icon">
             <summary>
             
@@ -542,19 +493,6 @@
             <param name="isEncrypt">是否加密</param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.AutoSaveParameterItem.Create``1(System.String,``0,System.String,System.String,System.Windows.Data.Binding,System.Boolean)">
-            <summary>
-            创建一个自动保存参数的对象
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="parameterName">参数名称</param>
-            <param name="defaulValue">默认值</param>
-            <param name="displayName">显示名称</param>
-            <param name="isEnableBinding">使能绑定</param>
-            <param name="unit">单位</param>
-            <param name="isEncrypt">是否加密</param>
-            <returns></returns>
-        </member>
         <member name="P:SCADA.CommonLib.AutoSaveParameterItem.ParameterPath">
             <summary>
             参数在文件中的保存位置
@@ -585,21 +523,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.IsEnableBinding">
-            <summary>
-            绑定使能
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.VisibilityBinding">
-            <summary>
-            可视性绑定
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.Command">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="M:SCADA.CommonLib.AutoSaveParameterItem.OnParameterChanged">
             <summary>
             
@@ -700,11 +623,6 @@
             </summary>
             <param name="parameterItem"></param>
         </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem`1.IsEnable">
-            <summary>
-            参数是否已启用编辑
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.CacheItem`1">
             <summary>
             
@@ -788,7 +706,7 @@
         </member>
         <member name="P:SCADA.CommonLib.CacheSyncOption`1.ExpireTime">
             <summary>
-            过期时间秒
+            过期时间秒,默认缓存2小时
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.CacheSyncOption`1.MaxCount">
@@ -813,7 +731,7 @@
         </member>
         <member name="P:SCADA.CommonLib.CacheSyncOption`1.ProcessSize">
             <summary>
-            每次同步处理的数据大小
+            每次同步处理的数据大小,默认100
             </summary>
         </member>
         <member name="M:SCADA.CommonLib.CacheSyncOption`1.Dispose">
@@ -4102,111 +4020,6 @@
             <param name="value">更新值</param>
             <returns></returns>
         </member>
-        <member name="T:SCADA.CommonLib.Data.DIL.MySql.MySQLDB">
-            <summary>
-            MySQL 数据库
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.#ctor(System.String,System.String,System.String,System.String)">
-            <summary>
-            MySQL 数据库
-            </summary>
-            <param name="server">如果不是用默认端口请用':' 隔开 例如127.0.0.1:3306</param>
-            <param name="database"></param>
-            <param name="username"></param>
-            <param name="password"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetDate">
-            <summary>
-            获取服务器时间和日期
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.Init(System.String,System.String,System.String,System.String)">
-            <summary>
-            数据库初始化
-            </summary>
-            <param name="serverName">服务器</param>
-            <param name="dataBaseName">数据库名称</param>
-            <param name="dataBaseUserName">用户名</param>
-            <param name="dataBasePassWord">密码</param>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetCnn">
-            <summary>
-            获取连接
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetProduceParameters">
-            <summary>
-            获取存储过程参数
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetProduces">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetTableColumns">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetTables">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetViewColumns">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.GetViews">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.UpdateTableComment(System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="tableName"></param>
-            <param name="comment"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.UpdateColumnComment(System.String,System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="tableName"></param>
-            <param name="columnName"></param>
-            <param name="comment"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.CreateTable(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="tableName"></param>
-            <returns></returns>
-            <exception cref="T:System.NotImplementedException"></exception>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.DIL.MySql.MySQLDB.CreateTable(System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="id"></param>
-            <param name="tableName"></param>
-            <returns></returns>
-            <exception cref="T:System.NotImplementedException"></exception>
-        </member>
         <member name="T:SCADA.CommonLib.Data.DIL.MySql.MySqlTable">
             <summary>
             
@@ -4991,63 +4804,6 @@
             <param name="dstTableName"></param>
             <param name="src">数据源</param>
         </member>
-        <member name="T:SCADA.CommonLib.Data.MySQLHeleper">
-            <summary>
-            MySQL 操作类
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.#ctor(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="cnnStr"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetCommand">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetConnection">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetDataAdapter">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetDBParameter(System.String,System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="parameterName"></param>
-            <param name="value"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.BulkInsert(System.String,System.Collections.Generic.List{SCADA.CommonLib.Data.DIL.UpdateItem[]})">
-            <summary>
-            
-            </summary>
-            <param name="dstTableName"></param>
-            <param name="src"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.BulkInsert(System.String,System.Data.DataTable)">
-            <summary>
-            
-            </summary>
-            <param name="dstTableName"></param>
-            <param name="srcdt"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Data.MySQLHeleper.GetLastRowIdStr">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
         <member name="T:SCADA.CommonLib.Data.NpgSQLHelper">
             <summary>
             
@@ -6103,22 +5859,6 @@
             获取是否是以管理员运行的
             </summary>
         </member>
-        <member name="T:SCADA.CommonLib.Helper.BartenderHelper">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.Print``1(``0,System.String,System.String,System.Boolean,System.Collections.Generic.Dictionary{System.String,System.String})">
-            <summary>
-            
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="obj"></param>
-            <param name="templetPath"></param>
-            <param name="printer"></param>
-            <param name="autoMapper"></param>
-            <param name="mapping"></param>
-        </member>
         <member name="T:SCADA.CommonLib.Helper.BeepHelper">
             <summary>
             控制蜂鸣器
@@ -7164,7 +6904,7 @@
             JSON序列化
             </summary>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.JsonHelper.JsonSerialize``1(``0,System.Boolean,System.Boolean)">
+        <member name="M:SCADA.CommonLib.Helper.JsonHelper.JsonSerialize``1(``0,System.Boolean)">
             <summary>
             
             </summary>
@@ -7181,13 +6921,6 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
-            <summary>
-            判断字符串是Json
-            </summary>
-            <param name="str"></param>
-            <returns></returns>
-        </member>
         <member name="M:SCADA.CommonLib.Helper.JsonHelper.JsonDeserialize``1(System.String)">
             <summary>
             JSON反序列化
@@ -7225,6 +6958,13 @@
             <param name="type"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
+            <summary>
+            判断字符串是Json
+            </summary>
+            <param name="str"></param>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.CommonLib.Helper.WhereBuilder">
             <summary>
             Generating SQL from expression trees, Part 2
@@ -8080,19 +7820,6 @@
             </summary>
             <param name="random">随机数填充</param>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.SetBindingValue(System.Windows.Data.Binding,System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="binding"></param>
-            <param name="value"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.GetBindingValue(System.Windows.Data.Binding)">
-            <summary>
-            
-            </summary>
-            <param name="binding"></param>
-        </member>
         <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.InvokeMatchPara(System.Reflection.MethodInfo,System.Object,System.Object)">
             <summary>
             自动匹配执行参数
@@ -9740,46 +9467,6 @@
             <param name="logName"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.Logger.CreatLogger(System.Type,System.Windows.Controls.RichTextBox)">
-            <summary>
-            
-            </summary>
-            <param name="logType"></param>
-            <param name="richTextBox"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.Logger.CreatLogger(System.String,System.Windows.Controls.RichTextBox)">
-            <summary>
-            
-            </summary>
-            <param name="logName"></param>
-            <param name="richTextBox"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.Logger.CreatLogger(System.String,System.Windows.Controls.DataGrid)">
-            <summary>
-            
-            </summary>
-            <param name="logName"></param>
-            <param name="dataGrid"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.Logger.PutToRichTextBox(System.Windows.Controls.RichTextBox,System.String)">
-            <summary>
-            将日志输出到RichTextBox,调用此方法后当控件被释放时务必 
-            请看<see cref="M:SCADA.CommonLib.LoggerHelper.Logger.RemoveLogContainer(System.Object)"/> 移除日志接收容器
-            </summary>
-            <param name="richTextBox"></param>
-            <param name="logName">按照日志名称过滤</param>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.Logger.PutToTextBlock(System.Windows.Controls.TextBlock,System.String)">
-            <summary>
-            将日志输出到Textblock,调用此方法后当控件被释放时务必 
-            请看<see cref="M:SCADA.CommonLib.LoggerHelper.Logger.RemoveLogContainer(System.Object)"/> 移除日志接收容器
-            </summary>
-            <param name="text"></param>
-            <param name="logName"></param>
-        </member>
         <member name="M:SCADA.CommonLib.LoggerHelper.Logger.RemoveLogContainer(System.Object)">
             <summary>
             控件被释放时移除日志容器
@@ -9971,44 +9658,6 @@
             
             </summary>
         </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.RichTextBoxAppender.#ctor(System.Windows.Controls.RichTextBox)">
-            <summary>
-            
-            </summary>
-            <param name="richTextBox"></param>
-        </member>
-        <member name="T:SCADA.CommonLib.LoggerHelper.TextBlockAppender">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.TextBlockAppender.#ctor(System.Windows.Controls.TextBlock)">
-            <summary>
-            
-            </summary>
-            <param name="textbox"></param>
-        </member>
-        <member name="P:SCADA.CommonLib.LoggerHelper.TextBlockAppender.LogLevel">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.LoggerHelper.TextBlockAppender.LogContent">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="E:SCADA.CommonLib.LoggerHelper.TextBlockAppender.PropertyChanged">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.LoggerHelper.TextBlockAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            
-            </summary>
-            <param name="loggingEvent"></param>
-        </member>
         <member name="T:SCADA.CommonLib.MemoryCache`1">
             <summary>
             内存中的缓冲
@@ -10035,13 +9684,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.ObservableObject.Item(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="columnName"></param>
-            <returns></returns>
-        </member>
         <member name="P:SCADA.CommonLib.ObservableObject.Error">
             <summary>
             
@@ -10196,11 +9838,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.Context.HttpContext">
-            <summary>
-            Http 上下文
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.RpcPara">
             <summary>
             远程调用参数

Lib/SCADA.xml

@@ -1581,6 +1581,15 @@
             <param name="encoding"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.BaseDevice.GetWriteByte(SCADA.Drive.RegInfo,System.Text.Encoding,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="reg"></param>
+            <param name="encoding"></param>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
         <member name="F:SCADA.BaseDevice.RegPackageBuffer">
             <summary>
             缓存读取命令
@@ -1667,9 +1676,17 @@
             <param name="regNames"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.BaseDevice.WriteMulReg(System.Collections.Generic.Dictionary{System.String,System.Object[]},System.Text.Encoding)">
+        <member name="M:SCADA.BaseDevice.WriteMulReg(System.Collections.Generic.Dictionary{System.String,System.String},System.Text.Encoding)">
             <summary>
             
+            </summary>
+            <param name="values"></param>
+            <param name="encoding"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.BaseDevice.WriteMulReg(System.Collections.Generic.Dictionary{System.String,System.Object[]},System.Text.Encoding)">
+            <summary>
+            提供按照寄存器的变量名写入设备数据的方法, 自动按照对象的小排布寄存器
             </summary>
             <param name="values"></param>
             <param name="encoding">默认UTF8</param>
@@ -4878,6 +4895,15 @@
             <param name="objs"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.Drive.BaseProtocol.GetWriteByte(SCADA.Drive.RegInfo,System.Text.Encoding,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="reg"></param>
+            <param name="encoding"></param>
+            <param name="writeStr"></param>
+            <returns></returns>
+        </member>
         <member name="M:SCADA.Drive.BaseProtocol.GetWriteByte(SCADA.Drive.RegInfo,System.Text.Encoding,System.Object[])">
             <summary>
             

SCADA_DAQ.Language/Language.tt

@@ -18,7 +18,7 @@
 <#
 	string solutionsPath = Host.ResolveAssemblyReference("$(SolutionDir)");
 	string projectPath = Host.ResolveAssemblyReference("$(ProjectDir)");
-	var dt=SCADA.CommonCtrl.ExcelHelper.GetImportDataTable(@$"{projectPath}语言文件.xlsx","语言文件",2); 
+	var dt=SCADA.CommonCtrl.ExcelHelper.GetImportDataTable(@$"{projectPath}语言文件.xlsx","语言文件",3); 
 	for(int i=1;i<dt.Columns.Count;i++){
 		string filename = dt.Columns[i].ColumnName.ToString()+".xaml";
 		manager.StartNewFile(filename);

SCADA_DAQ.Language/de-de.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">Stornieren</s:String>
 		<s:String x:Key="Yes">Ja.</s:String>
 		<s:String x:Key="No">Nein</s:String>
-
 		<s:String x:Key="SysCfg_Menu">Menü</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">Verbunden</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">Unverbunden</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">Passwort Bearbeiten</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">Benutzer wechseln(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">Minimieren</s:String>
 		<s:String x:Key="SysCfg_ReSize">Reduzierung</s:String>
 		<s:String x:Key="SysCfg_MaxSize">Maximieren</s:String>
 		<s:String x:Key="SysCfg_Close">Schließen</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">Topping</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">Topping abbrechen</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">Nach der Reparatur der Datenbank wird das System die aktuelle Datenbank neu starten und sichern und die Datenbank in ihren ursprünglichen Zustand wiederherstellen</s:String>
 		<s:String x:Key="SysCfg_Tip">Tipps</s:String>
 		<s:String x:Key="SysCfg_Wran">Warnung</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">Protokollupload fehlgeschlagen, bitte bestätigen Sie das Netzwerk vor dem Hochladen</s:String>
 		<s:String x:Key="SysCfg_LogUploading">Protokolle hochladen</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">Wird neu gestartet</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">Verzeichnis öffnen</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">Logbuch für Windows</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">Starten Sie erneut als Administrator</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">Protokolldatei hochladen</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">Aktualisierung prüfen</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">Aktualisierung erzwingen</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">Einstellungen des Systems</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">Computer Tags</s:String>
 		<s:String x:Key="SysCfg_LogLevel">Ebene des Protokolls</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">Lokale Daten</s:String>
 		<s:String x:Key="SysCfg_Language">Sprache</s:String>
 		<s:String x:Key="SysCfg_WindowSize">Größe des Fensters</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">Konfigurationsdatenbank</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">Einstellungen zum Thema</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">Farbe des Designs</s:String>
 		<s:String x:Key="SysCfg_ThemeName">Name des Objekts</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">Möchten Sie Desktop-Shortcut und Boot erstellen?</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">Es wird festgestellt, dass die Datenbankdatei beschädigt werden kann. Reparieren der Datenbank kann den Verlust historischer Daten verursachen.</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">Datenbankreparatur fehlgeschlagen</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">Organisation hinzufügen</s:String>
 		<s:String x:Key="SysCfg_Org">Organisation</s:String>
 		<s:String x:Key="SysCfg_OrgCode">Code der Organisation</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">Menü hinzufügen</s:String>
 		<s:String x:Key="SysCfg_MenuName">Name des Menüs</s:String>
 		<s:String x:Key="SysCfg_User">Benutzer</s:String>
+		<s:String x:Key="SysCfg_Password">Passwort</s:String>
+		<s:String x:Key="SysCfg_OldPassword">Altes Passwort</s:String>
+		<s:String x:Key="SysCfg_NewPassword">Neues Passwort</s:String>
+		<s:String x:Key="SysCfg_Repeat">wiederholen</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">Merken Sie sich das Passwort</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">Automatische Anmeldung</s:String>
 		<s:String x:Key="SysCfg_AddUser">Benutzer hinzufügen</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/en-us.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">Cancle</s:String>
 		<s:String x:Key="Yes">Yes</s:String>
 		<s:String x:Key="No">No</s:String>
-
 		<s:String x:Key="SysCfg_Menu">Menu</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">Linked</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">UnLinked</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">Modify Password</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">Change User(Ctrl+Alt+L)</s:String>
 		<s:String x:Key="SysCfg_CurrentUser">Current user</s:String>
-
 		<s:String x:Key="SysCfg_MinSize">Minimize</s:String>
 		<s:String x:Key="SysCfg_ReSize">Restore Down</s:String>
 		<s:String x:Key="SysCfg_MaxSize">Maximize</s:String>
 		<s:String x:Key="SysCfg_Close">Close</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">Topping</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">Cancel topping</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">After repairing the database, the system will be restarted, and the current database will be backed up and restored to its original state</s:String>
 		<s:String x:Key="SysCfg_Tip">Tip</s:String>
 		<s:String x:Key="SysCfg_Wran">Wran</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">Log upload failed, please confirm the network before uploading</s:String>
 		<s:String x:Key="SysCfg_LogUploading">Uploading logs</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">Will be restarted</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">Open Run Path</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">Windows Log</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">Restart and run as an administrator</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">Upload log file</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">Check update</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">Force update</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">System Config</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">Computer Tag</s:String>
 		<s:String x:Key="SysCfg_LogLevel">Log Level</s:String>
@@ -74,16 +69,14 @@
 		<s:String x:Key="SysCfg_LocalData">Local Data</s:String>
 		<s:String x:Key="SysCfg_Language">Language</s:String>
 		<s:String x:Key="SysCfg_WindowSize">Window Size</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">Database configuration</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">Theme Options</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">Theme Color</s:String>
 		<s:String x:Key="SysCfg_ThemeName">Theme Name</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">
 Do you want to create desktop shortcut and boot?</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">It is detected that the database file may be damaged. Repairing the database may cause the loss of historical data. Confirm the repair</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">Database repair failed</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">Add organization</s:String>
 		<s:String x:Key="SysCfg_Org">Org</s:String>
 		<s:String x:Key="SysCfg_OrgCode">Org code</s:String>
@@ -95,11 +88,15 @@ Do you want to create desktop shortcut and boot?</s:String>
 		<s:String x:Key="SysCfg_AddMenu">Add Menu</s:String>
 		<s:String x:Key="SysCfg_MenuName">Menu name</s:String>
 		<s:String x:Key="SysCfg_User">User</s:String>
+		<s:String x:Key="SysCfg_Password">Password</s:String>
+		<s:String x:Key="SysCfg_OldPassword">Old password</s:String>
+		<s:String x:Key="SysCfg_NewPassword">New password</s:String>
+		<s:String x:Key="SysCfg_Repeat">Repeat</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">Remember password</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">Automatic login</s:String>
 		<s:String x:Key="SysCfg_AddUser">Add User</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/ja-jp.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">キャンセル</s:String>
 		<s:String x:Key="Yes">はい</s:String>
 		<s:String x:Key="No">なし</s:String>
-
 		<s:String x:Key="SysCfg_Menu">メニュー</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">サーバが正常です</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">サーバが切断されました</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">パスワードを変更</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">ユーザーを切り替え(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">最小化</s:String>
 		<s:String x:Key="SysCfg_ReSize">元に戻す</s:String>
 		<s:String x:Key="SysCfg_MaxSize">最大化</s:String>
 		<s:String x:Key="SysCfg_Close">閉じる</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">屋根を置く</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">キャンセル</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">データベースシステムを修復すると再起動し、再起動したら現在のデータベースをバックアップし、データベースを初期状態に戻します</s:String>
 		<s:String x:Key="SysCfg_Tip">ヒント</s:String>
 		<s:String x:Key="SysCfg_Wran">警告</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">ログのアップロードに失敗しました。ネットワークを確認してからアップロードしてください。</s:String>
 		<s:String x:Key="SysCfg_LogUploading">ログをアップロード中</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">再起動されます</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">実行ディレクトリを開く</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">システムログ</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">再起動は管理者で行います</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">アップロードログファイル</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">更新を確認</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">強制更新</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">システム設定</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">コンピュータラベル</s:String>
 		<s:String x:Key="SysCfg_LogLevel">ログレベル</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">ローカルデータ</s:String>
 		<s:String x:Key="SysCfg_Language">言語</s:String>
 		<s:String x:Key="SysCfg_WindowSize">ウィンドウサイズ</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">データベース構成</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">テーマの設定</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">テーマの色</s:String>
 		<s:String x:Key="SysCfg_ThemeName">テーマ名</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">デスクトップのショートカットを作成して起動しますか？</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">データベースファイルが壊れていることが検出されました。データベースを修復すると履歴データが失われてしまう可能性があります。修復を確認してください。</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">データベースの修復に失敗しました。</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">組織を追加</s:String>
 		<s:String x:Key="SysCfg_Org">組織</s:String>
 		<s:String x:Key="SysCfg_OrgCode">組織コード</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">メニューを追加</s:String>
 		<s:String x:Key="SysCfg_MenuName">メニュー名</s:String>
 		<s:String x:Key="SysCfg_User">ユーザー</s:String>
+		<s:String x:Key="SysCfg_Password">パスワード</s:String>
+		<s:String x:Key="SysCfg_OldPassword">古いパスワード</s:String>
+		<s:String x:Key="SysCfg_NewPassword">新しいパスワード</s:String>
+		<s:String x:Key="SysCfg_Repeat">繰り返す</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">パスワードを記憶する</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">自動ログイン</s:String>
 		<s:String x:Key="SysCfg_AddUser">ユーザを追加</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/ko-kr.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">취소 하 다.</s:String>
 		<s:String x:Key="Yes">네,그렇습니다.</s:String>
 		<s:String x:Key="No">아니.</s:String>
-
 		<s:String x:Key="SysCfg_Menu">메뉴.</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">서버 가 정상 입 니 다.</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">서버 가 끊어지다</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">비밀번호 변경</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">사용자 전환(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">최소 화</s:String>
 		<s:String x:Key="SysCfg_ReSize">환원 하 다.</s:String>
 		<s:String x:Key="SysCfg_MaxSize">최대 화</s:String>
 		<s:String x:Key="SysCfg_Close">폐쇄 하 다.</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">꼭대기 에 놓다</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">취소 하 다.</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">데이터 베 이 스 를 복구 하면 시스템 이 재 개 됩 니 다. 재 부팅 후 현재 데이터 베 이 스 를 백업 하고 데이터 베 이 스 를 초기 상태 로 복원 합 니 다.</s:String>
 		<s:String x:Key="SysCfg_Tip">제시 하 다.</s:String>
 		<s:String x:Key="SysCfg_Wran">경고 하 다.</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">로그 업로드 실패, 네트워크 확인 후 업로드</s:String>
 		<s:String x:Key="SysCfg_LogUploading">로그 올 리 는 중</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">재 부팅</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">실행 목록 열기</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">시스템 로그</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">관리자 로 다시 시작 하기</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">로그 파일 을 업로드 하 다</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">업데이트 확인</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">강제 업데이트</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">시스템 설정</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">컴퓨터 라벨</s:String>
 		<s:String x:Key="SysCfg_LogLevel">로그 수준</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">로 컬 데이터</s:String>
 		<s:String x:Key="SysCfg_Language">언어.</s:String>
 		<s:String x:Key="SysCfg_WindowSize">창 크기</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">데이터베이스 구성</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">테마 설정</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">테마 색상</s:String>
 		<s:String x:Key="SysCfg_ThemeName">테마 이름</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">데스크 톱 바로 가기 와 부팅 을 시작 하 시 겠 습 니까?</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">데이터 베 이 스 를 찾 은 파일 이 손상 되 었 을 수도 있 습 니 다. 데이터 베 이 스 를 복구 하면 역사 데이터 가 실 종 될 수도 있 습 니 다. 복구 확인</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">데이터베이스 복구 실패</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">조직 을 늘리다</s:String>
 		<s:String x:Key="SysCfg_Org">조직 하 다.</s:String>
 		<s:String x:Key="SysCfg_OrgCode">조직 코드</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">메뉴 추가</s:String>
 		<s:String x:Key="SysCfg_MenuName">메뉴 이름</s:String>
 		<s:String x:Key="SysCfg_User">사용자</s:String>
+		<s:String x:Key="SysCfg_Password">암호</s:String>
+		<s:String x:Key="SysCfg_OldPassword">이전 비밀번호</s:String>
+		<s:String x:Key="SysCfg_NewPassword">새 비밀번호</s:String>
+		<s:String x:Key="SysCfg_Repeat">반복하다</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">암호를 기억하십시오</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">자동 로그인</s:String>
 		<s:String x:Key="SysCfg_AddUser">사용자 추가</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/ru-ru.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">отмена</s:String>
 		<s:String x:Key="Yes">Да</s:String>
 		<s:String x:Key="No">Нет</s:String>
-
 		<s:String x:Key="SysCfg_Menu">меню</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">Сервер нормальный</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">отключение сервера</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">Изменить пароль</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">Переключить пользователя(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">минимизация</s:String>
 		<s:String x:Key="SysCfg_ReSize">восстановление</s:String>
 		<s:String x:Key="SysCfg_MaxSize">максимизация</s:String>
 		<s:String x:Key="SysCfg_Close">закрыть</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">ставить верх</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">Снять отметку</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">восстановление системы баз данных будет возобновлено, возобновлено резервное копирование текущей базы данных и возвращение базы данных в исходное состояние</s:String>
 		<s:String x:Key="SysCfg_Tip">подсказка</s:String>
 		<s:String x:Key="SysCfg_Wran">предупреждение</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">Не удаётся загрузить журнал, убедитесь, что сеть снова загружена</s:String>
 		<s:String x:Key="SysCfg_LogUploading">журнал загрузки</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">Перезагрузить</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">Открыть каталог запуска</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">системный журнал</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">Запустить с помощью Администратора</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">Файл журнала загрузки</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">проверять обновление</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">обязательное обновление</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">Настройки системы</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">компьютерная этикетка</s:String>
 		<s:String x:Key="SysCfg_LogLevel">уровень журнала</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">Локальные данные</s:String>
 		<s:String x:Key="SysCfg_Language">язык</s:String>
 		<s:String x:Key="SysCfg_WindowSize">размер окна</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">конфигурация базы данных</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">Настройки темы</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">цвет темы</s:String>
 		<s:String x:Key="SysCfg_ThemeName">название темы</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">создать комбинацию клавиш рабочего стола и начать работать с самого начала?</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">обнаружено, что файл базы данных может быть повреждён, ремонт базы данных может привести к потере исторических данных, подтверждение восстановления</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">Ошибка восстановления базы данных</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">Добавить организацию</s:String>
 		<s:String x:Key="SysCfg_Org">организация</s:String>
 		<s:String x:Key="SysCfg_OrgCode">код организации</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">Добавить меню</s:String>
 		<s:String x:Key="SysCfg_MenuName">Название меню</s:String>
 		<s:String x:Key="SysCfg_User">пользователь</s:String>
+		<s:String x:Key="SysCfg_Password">пароль</s:String>
+		<s:String x:Key="SysCfg_OldPassword">Старый пароль</s:String>
+		<s:String x:Key="SysCfg_NewPassword">Новый пароль</s:String>
+		<s:String x:Key="SysCfg_Repeat">повторять</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">Запомните пароль</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">Автоматический вход в систему</s:String>
 		<s:String x:Key="SysCfg_AddUser">Добавить пользователя</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/th-th.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">ยกเลิก</s:String>
 		<s:String x:Key="Yes">ใช่แล้ว</s:String>
 		<s:String x:Key="No">ไม่</s:String>
-
 		<s:String x:Key="SysCfg_Menu">เมนู</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">เซิร์ฟเวอร์ปกติ</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">การเชื่อมต่อเซิร์ฟเวอร์</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">เปลี่ยนรหัสผ่าน</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">เปลี่ยนผู้ใช้(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">ต่ำสุด</s:String>
 		<s:String x:Key="SysCfg_ReSize">ทำให้ลดลง</s:String>
 		<s:String x:Key="SysCfg_MaxSize">สูงสุด</s:String>
 		<s:String x:Key="SysCfg_Close">ปิดกล้อง</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">จุดยืน</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">การยกเลิก</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">ซ่อมแซมฐานข้อมูลระบบจะรีสตาร์ทเครื่องรีสตาร์ทและกลับไปที่ฐานข้อมูลปัจจุบันและกลับไปยังสถานะเริ่มต้น</s:String>
 		<s:String x:Key="SysCfg_Tip">ทูลเกล้าฯถวาย</s:String>
 		<s:String x:Key="SysCfg_Wran">เตือนภัย</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">ล็อกอัพโหลดล้มเหลวโปรดตรวจสอบเครือข่ายของคุณและอัปโหลดอีกครั้ง</s:String>
 		<s:String x:Key="SysCfg_LogUploading">อัพโหลดบันทึก</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">จะเริ่มต้นใหม่</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">เปิดใช้ไดเรกทอรี</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">เข้าสู่ระบบ</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">เริ่มต้นใหม่เพื่อเรียกใช้โดยผู้ดูแลระบบ</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">อัพโหลดแฟ้มบันทึก</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">ตรวจสอบการปรับปรุง</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">บังคับให้ปรับปรุง</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">การตั้งค่าระบบ</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">ป้ายคอมพิวเตอร์</s:String>
 		<s:String x:Key="SysCfg_LogLevel">ระดับเข้าสู่ระบบ</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">ข้อมูลท้องถิ่น</s:String>
 		<s:String x:Key="SysCfg_Language">ภาษา</s:String>
 		<s:String x:Key="SysCfg_WindowSize">ขนาดหน้าต่าง</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">การตั้งค่าฐานข้อมูล</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">การตั้งค่าหัวข้อ</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">สีชุดตกแต่ง</s:String>
 		<s:String x:Key="SysCfg_ThemeName">ชื่อกระทู้</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">คุณต้องการที่จะสร้างทางลัดเดสก์ทอปและเริ่มต้นด้วยตนเอง</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">ตรวจพบแฟ้มฐานข้อมูลอาจจะเสียหายซ่อมแซมฐานข้อมูลอาจทำให้เกิดการสูญเสียข้อมูลประวัติยืนยันการซ่อมแซม</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">การซ่อมแซมฐานข้อมูลล้มเหลว</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">เพิ่มองค์กร</s:String>
 		<s:String x:Key="SysCfg_Org">องค์กร</s:String>
 		<s:String x:Key="SysCfg_OrgCode">รหัสองค์กร</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">เพิ่มเมนู</s:String>
 		<s:String x:Key="SysCfg_MenuName">ชื่อเมนู</s:String>
 		<s:String x:Key="SysCfg_User">ประเทศอเมริกา</s:String>
+		<s:String x:Key="SysCfg_Password">รหัสผ่าน</s:String>
+		<s:String x:Key="SysCfg_OldPassword">รหัสผ่านเก่า</s:String>
+		<s:String x:Key="SysCfg_NewPassword">รหัสผ่านใหม่</s:String>
+		<s:String x:Key="SysCfg_Repeat">ซ้ำ</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">จํารหัสผ่าน</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">เข้าสู่ระบบอัตโนมัติ</s:String>
 		<s:String x:Key="SysCfg_AddUser">เพิ่มผู้ใช้</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/zh-cn.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">取消</s:String>
 		<s:String x:Key="Yes">是</s:String>
 		<s:String x:Key="No">否</s:String>
-
 		<s:String x:Key="SysCfg_Menu">菜单</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">服务器正常</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">服务器断开</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">修改密码</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">切换用户(Ctrl+Alt+L)</s:String>
 		<s:String x:Key="SysCfg_CurrentUser">当前用户</s:String>
-
 		<s:String x:Key="SysCfg_MinSize">最小化</s:String>
 		<s:String x:Key="SysCfg_ReSize">还原</s:String>
 		<s:String x:Key="SysCfg_MaxSize">最大化</s:String>
 		<s:String x:Key="SysCfg_Close">关闭</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">置顶</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">取消置顶</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">修复数据库系统将会重启，重启后回备份当前数据库并将数据库回复到初始状态</s:String>
 		<s:String x:Key="SysCfg_Tip">提示</s:String>
 		<s:String x:Key="SysCfg_Wran">警告</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">日志上传失败,请确认网络后再上传</s:String>
 		<s:String x:Key="SysCfg_LogUploading">正在上传日志</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">将被重启</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">打开运行目录</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">系统日志</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">重启以管理员运行</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">上传日志文件</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">检查更新</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">强制更新</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">系统设置</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">电脑标签</s:String>
 		<s:String x:Key="SysCfg_LogLevel">日志级别</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">本地数据</s:String>
 		<s:String x:Key="SysCfg_Language">语言</s:String>
 		<s:String x:Key="SysCfg_WindowSize">窗口尺寸</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">数据配置</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">主题设置</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">主题颜色</s:String>
 		<s:String x:Key="SysCfg_ThemeName">主题名称</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">是否创建桌面快捷方式和开机自启动?</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">检测到数据库文件可能已经损坏,修复数据库可能会导致历史数据丢失,确认修复</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">数据库修复失败</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">添加组织</s:String>
 		<s:String x:Key="SysCfg_Org">组织</s:String>
 		<s:String x:Key="SysCfg_OrgCode">组织代号</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">添加菜单</s:String>
 		<s:String x:Key="SysCfg_MenuName">菜单名称</s:String>
 		<s:String x:Key="SysCfg_User">用户</s:String>
+		<s:String x:Key="SysCfg_Password">密码</s:String>
+		<s:String x:Key="SysCfg_OldPassword">旧密码</s:String>
+		<s:String x:Key="SysCfg_NewPassword">新密码</s:String>
+		<s:String x:Key="SysCfg_Repeat">重复</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">记住密码</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">自动登录</s:String>
 		<s:String x:Key="SysCfg_AddUser">添加用户</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ.Language/zh-tw.xaml

@@ -6,7 +6,6 @@
 		<s:String x:Key="SysCfg_Cancle">取消</s:String>
 		<s:String x:Key="Yes">是</s:String>
 		<s:String x:Key="No">否</s:String>
-
 		<s:String x:Key="SysCfg_Menu">選單</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkOk">服務器正常</s:String>
 		<s:String x:Key="SysCfg_DataBaseLinkNG">服務器斷開</s:String>
@@ -28,14 +27,12 @@
 		<s:String x:Key="SysCfg_ModifyPassword">修改密碼</s:String>
 		<s:String x:Key="SysCfg_SwitchUser">切換用戶(Ctrl+Alt+L)</s:String>
 
-
 		<s:String x:Key="SysCfg_MinSize">最小化</s:String>
 		<s:String x:Key="SysCfg_ReSize">還原</s:String>
 		<s:String x:Key="SysCfg_MaxSize">最大化</s:String>
 		<s:String x:Key="SysCfg_Close">關閉</s:String>
 		<s:String x:Key="SysCfg_SetTopmost">置頂</s:String>
 		<s:String x:Key="SysCfg_CancleTopmost">取消置頂</s:String>
-
 		<s:String x:Key="SysCfg_DataBaseRepairTip">修復資料庫系統將會重啓，重啟後回備份當前資料庫並將資料庫回復到初始狀態</s:String>
 		<s:String x:Key="SysCfg_Tip">提示</s:String>
 		<s:String x:Key="SysCfg_Wran">警告</s:String>
@@ -47,7 +44,6 @@
 		<s:String x:Key="SysCfg_LogUploadFail">日誌上傳失敗，請確認網絡後再上傳</s:String>
 		<s:String x:Key="SysCfg_LogUploading">正在上傳日誌</s:String>
 		<s:String x:Key="SysCfg_WillRestartTip">將被重啓</s:String>
-
 		<s:String x:Key="SysCfg_OpenRunPath">打開運行目錄</s:String>
 		<s:String x:Key="SysCfg_WindowsLog">系統日誌</s:String>
 		<s:String x:Key="SysCfg_RestartRunAsAdmin">重啓以管理員運行</s:String>
@@ -60,7 +56,6 @@
 		<s:String x:Key="SysCfg_UploadLogFile">上傳日誌檔</s:String>
 		<s:String x:Key="SysCfg_CheckAndUpdate">檢查更新</s:String>
 		<s:String x:Key="SysCfg_ForceUpdate">強制更新</s:String>
-
 		<s:String x:Key="SysCfg_SystemConfig">系統設置</s:String>
 		<s:String x:Key="SysCfg_ComputerTag">電腦標籤</s:String>
 		<s:String x:Key="SysCfg_LogLevel">日誌級別</s:String>
@@ -74,15 +69,13 @@
 		<s:String x:Key="SysCfg_LocalData">本地數據</s:String>
 		<s:String x:Key="SysCfg_Language">語言</s:String>
 		<s:String x:Key="SysCfg_WindowSize">視窗尺寸</s:String>
-
+		<s:String x:Key="SysCfg_DBConfig">資料庫配寘</s:String>
 		<s:String x:Key="SysCfg_ThemeOptions">主題設定</s:String>
 		<s:String x:Key="SysCfg_ThemeColor">主題顏色</s:String>
 		<s:String x:Key="SysCfg_ThemeName">主題名稱</s:String>
-
 		<s:String x:Key="SysCfg_IsCreateShortcut">是否創建案頭快捷方式和開機自啟動？</s:String>
 		<s:String x:Key="SysCfg_DatabaseIsDamageTip">檢測到資料庫檔案可能已經損壞，修復資料庫可能會導致歷史資料丟失，確認修復</s:String>
 		<s:String x:Key="SysCfg_DatabaseRepairFail">資料庫修復失敗</s:String>
-
 		<s:String x:Key="SysCfg_AddOrg">添加組織</s:String>
 		<s:String x:Key="SysCfg_Org">組織</s:String>
 		<s:String x:Key="SysCfg_OrgCode">組織代號</s:String>
@@ -94,11 +87,15 @@
 		<s:String x:Key="SysCfg_AddMenu">添加選單</s:String>
 		<s:String x:Key="SysCfg_MenuName">選單名稱</s:String>
 		<s:String x:Key="SysCfg_User">用戶</s:String>
+		<s:String x:Key="SysCfg_Password"> 密碼</s:String>
+		<s:String x:Key="SysCfg_OldPassword">舊密碼</s:String>
+		<s:String x:Key="SysCfg_NewPassword">新密碼</s:String>
+		<s:String x:Key="SysCfg_Repeat">重複</s:String>
+		<s:String x:Key="SysCfg_RememberPassword">記住密碼</s:String>
+		<s:String x:Key="SysCfg_AutoLogin">自動登錄</s:String>
 		<s:String x:Key="SysCfg_AddUser">添加用戶</s:String>
 
 	    <!--按钮-->
-
-
 	    <!--表格-->
 
 </ResourceDictionary>

SCADA_DAQ/Customer/Models/TaskManagement/AddTaskModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Windows;
 
 namespace SCADA_DAQ.Customer.Models.TaskManagement
 {
@@ -158,10 +158,10 @@ namespace SCADA_DAQ.Customer.Models.TaskManagement
         /// <summary>
         /// 开始生产时间
         /// </summary>
-        private DateTime _WorkStartTime = DateTime.Now;
-        [AutoViewProperty("开始生产时间", Icon = "")]
+        private DateTime? _WorkStartTime;
+        [AutoViewProperty("开始生产时间", Icon = "",Visibility =Visibility.Collapsed)]
         [Column(T_Col_Name.APP_TaiLing_TaskManagement.WorkStartTime_Dt)]
-        public DateTime WorkStartTime
+        public DateTime? WorkStartTime
         {
             get { return _WorkStartTime; }
             set