xuhsili 1 年之前
父節點
當前提交
1f5a38a8b0

+ 50 - 4
.idea/workspace.xml

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BranchesTreeState">
+    <expand>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="310b6a4c-4135-449b-afd6-517c645bb1a2" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -36,6 +54,7 @@
       <updated>1698153763738</updated>
       <workItem from="1698153787270" duration="1219000" />
       <workItem from="1698386696735" duration="2000" />
+      <workItem from="1698387035263" duration="7820000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1698154296073</created>
@@ -44,25 +63,52 @@
       <option name="project" value="LOCAL" />
       <updated>1698154296073</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="ackages">
+      <created>1698399589163</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1698399589164</updated>
+    </task>
+    <task id="LOCAL-00003" summary="2">
+      <created>1698399631728</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1698399631728</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="2" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="1" />
-    <option name="LAST_COMMIT_MESSAGE" value="1" />
+    <MESSAGE value="ackages" />
+    <MESSAGE value="2" />
+    <option name="LAST_COMMIT_MESSAGE" value="2" />
   </component>
   <component name="WindowStateProjectService">
     <state x="740" y="256" key="FileChooserDialogImpl" timestamp="1698153965183">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
     <state x="740" y="256" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1698153965183" />
-    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1698154299511">
+    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1698399634151">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
-    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1698154299511" />
+    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1698399634151" />
     <state x="761" y="422" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1698154200207">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>

+ 8 - 5
NEIntelligentControl2/Pages/Home/PageWindturbineAGC.xaml.cs

@@ -29,7 +29,7 @@ namespace NEIntelligentControl2.Pages.Home
     /// </summary>
     public partial class PageWindturbineAGC : Page
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(PageWindturbineAGC));
+        private static readonly ILog log = LogManager.GetLogger("File");
         private readonly IPageAction _IPageAction;
         private readonly WEBHelper _WEBHelper;
 
@@ -71,6 +71,9 @@ namespace NEIntelligentControl2.Pages.Home
             YFDLTag = ConfigurationManager.AppSettings["YFDLTag"];
             NFDLTag = ConfigurationManager.AppSettings["NFDLTag"];
             LLGLTag = ConfigurationManager.AppSettings["LLGLTag"];
+
+
+            log.Warn($"日月年发");
         }
 
         private void OnWindturbineMessage(Dictionary<string, WindturbineInfo> obj)
@@ -145,17 +148,17 @@ namespace NEIntelligentControl2.Pages.Home
                     var vs = GetValues(url);
                     foreach (var v in vs)
                     {
-                        log.Warn($"日月年发{v.Value.Ts}:{v.Value.Value}");
+                        log.Warn($"日月年发:{v.Value.Value}");
                     }
 
                     if (vs == null || vs.Count == 0) continue;
 
                     var ss = GetValuesSingle(SSGLTag);
-                    log.Warn($"实时{ss.Ts}:{ss.Value}");
+                    log.Warn($"实时:{ss.Value}");
                     var mb = GetValuesSingle(MBGLTag);
-                    log.Warn($"目标{mb.Ts}:{mb.Value}");
+                    log.Warn($"目标:{mb.Value}");
                     var ll = GetValuesSingle(LLGLTag);
-                    log.Warn($"理论{ll.Ts}:{ll.Value}");
+                    log.Warn($"理论:{ll.Value}");
 
                     Dispatcher.Invoke(() =>
                     {

+ 1 - 1
NEIntelligentControl2/Service/AGC/AGCManager.cs

@@ -17,7 +17,7 @@ namespace NEIntelligentControl2.Service.AGC
     /// </summary>
     public class AGCManager
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(AGCManager));
+        private static readonly ILog log = LogManager.GetLogger("File");
         /// <summary>
         /// AGC 信息
         /// </summary>