From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 12 三月 2025 10:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx | 70 +++++++++++------------------------
1 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx
index 5c3b76a..6c67036 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx
@@ -434,7 +434,7 @@
IC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
- <data name="barBtnWorkingPower.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barBtnEnergyAnaly.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -520,7 +520,7 @@
OSAgTDEuNiwyOC4xTDEuNiwyOC4xeiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L
</value>
</data>
- <data name="barBtnWorkingEvaluation.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barBtnAccuracy.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -751,7 +751,7 @@
IDMyLDEwIDMyLDQgICIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
- <data name="barBtnDockingMonitor.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barBtnSetMonitorList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -777,7 +777,7 @@
Ljd6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
- <data name="barBtnDockingMonitorValue.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barBtnSetMonitorValueList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -798,50 +798,6 @@
LDI0IDEyLDI4IDE0LDI4IDE0LDI0IDE2LDI0IDE2LDE4IDE4LDE4IDE4LDIwIDIwLDIwIDIwLDE2IDIy
LDE2IDIyLDEwIDI0LDEwIDI0LDE0IDI2LDE0IDI2LDE4IDI4LDE4IDI4LDE0IDMwLDE0IDMwLDEwICAg
IDMyLDEwIDMyLDQgICIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
- <data name="barBtnAnalyseMonitor.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYIAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRmlsZHNfSXRlbXNfU2V0cyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5k
- Om5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6Izcy
- NzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQog
- IDxnIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0xMCwxMEg2VjZoNFYxMHogTTI0LDZIMTJ2NGgx
- MlY2eiBNMTAsMTJINnYxMmg0VjEyeiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPHBhdGggZD0i
- TTMxLDEyaC0zVjNjMC0wLjYtMC40LTEtMS0xSDNDMi40LDIsMiwyLjQsMiwzdjI0YzAsMC42LDAuNCwx
- LDEsMWg5djNjMCwwLjUsMC41LDEsMSwxaDE4YzAuNSwwLDEtMC41LDEtMSAgVjEzQzMyLDEyLjUsMzEu
- NSwxMiwzMSwxMnogTTQsMjZWNGgyMnY4SDEzYy0wLjUsMC0xLDAuNS0xLDF2MTNINHogTTMwLDMwSDE0
- di0ydi0yVjE0aDEyaDJoMlYzMHogTTIyLjcsMTguOUgyNGwtMC4zLDEuMmgtMS4zICBsLTEuMyw1LjFj
- LTAuMSwwLjYtMC40LDEuMS0wLjcsMS42Yy0wLjMsMC40LTAuNywwLjctMS4xLDAuOWMtMC40LDAuMi0w
- LjksMC4zLTEuNCwwLjNjLTAuNSwwLTEtMC4xLTEuMy0wLjMgIGMtMC40LTAuMi0wLjYtMC41LTAuNi0w
- LjljMC0wLjMsMC4xLTAuNSwwLjMtMC42YzAuMi0wLjIsMC40LTAuMywwLjctMC4zYzAuMSwwLDAuMiww
- LDAuMywwLjFjMC4xLDAsMC4yLDAuMSwwLjMsMC4yICBjMC4xLDAsMC4yLDAuMiwwLjMsMC40YzAuMSww
- LjEsMC4xLDAuMSwwLjIsMC4yYzAuMSwwLDAuMSwwLDAuMiwwYzAuMywwLDAuNS0wLjMsMC42LTAuOWwx
- LjMtNS43aC0wLjlsMC4zLTEuMmgxbDAuMi0wLjYgIGMwLjItMC43LDAuNS0xLjMsMS4xLTEuN2MwLjYt
- MC40LDEuMy0wLjYsMi4yLTAuNmMwLjUsMCwwLjgsMC4xLDEuMSwwLjJjMC4zLDAuMSwwLjUsMC4yLDAu
- NiwwLjRjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjYgIGMwLDAuMiwwLDAuMy0wLjEsMC41cy0wLjIsMC4z
- LTAuNCwwLjNzLTAuMywwLjEtMC41LDAuMWMtMC4yLDAtMC4zLDAtMC41LTAuMWMtMC4xLTAuMS0wLjMt
- MC4yLTAuNC0wLjNjLTAuMi0wLjItMC4zLTAuMy0wLjMtMC4zICBjLTAuMSwwLTAuMS0wLjEtMC4yLTAu
- MWMtMC4yLDAtMC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjMtMC4yLDAuN0wyMi43LDE4Ljl6
- IE0yNS4yLDIyLjFsMC42LDEuMmMwLjMtMC41LDAuNi0wLjgsMC43LTAuOSAgYzAuMi0wLjIsMC4zLTAu
- MywwLjUtMC40YzAuMi0wLjEsMC4zLTAuMSwwLjUtMC4xYzAuMiwwLDAuMywwLDAuNCwwLjFjMC4xLDAu
- MSwwLjIsMC4yLDAuMiwwLjRjMCwwLjEsMCwwLjItMC4xLDAuMyAgcy0wLjEsMC4xLTAuMiwwLjJzLTAu
- MSwwLjEtMC4yLDAuMWMwLDAtMC4xLDAtMC4zLDBjLTAuMiwwLTAuMywwLTAuMywwYy0wLjEsMC0wLjEs
- MC4xLTAuMiwwLjFjLTAuMSwwLjEtMC4yLDAuMS0wLjIsMC4yICBjMCwwLTAuMiwwLjItMC40LDAuNmww
- LjIsMC40YzAuMiwwLjMsMC4zLDAuNSwwLjQsMC42YzAuMSwwLjEsMC4yLDAuMSwwLjMsMC4xYzAuMiww
- LDAuMy0wLjEsMC42LTAuM2wwLjQsMC41ICBjLTAuNCwwLjQtMC45LDAuNi0xLjQsMC42Yy0wLjIsMC0w
- LjQsMC0wLjUtMC4xcy0wLjMtMC4yLTAuNC0wLjNzLTAuMi0wLjMtMC40LTAuNmwtMC4yLTAuNWMtMC4y
- LDAuMy0wLjQsMC42LTAuNiwwLjggIGMtMC4yLDAuMi0wLjQsMC40LTAuNiwwLjVDMjMuOCwyNiwyMy43
- LDI2LDIzLjUsMjZjLTAuMSwwLTAuMiwwLTAuMy0wLjFjLTAuMSwwLTAuMS0wLjEtMC4yLTAuMmMwLTAu
- MS0wLjEtMC4yLTAuMS0wLjMgIGMwLTAuMSwwLTAuMiwwLjEtMC4zYzAuMS0wLjEsMC4xLTAuMiwwLjIt
- MC4yczAuMi0wLjEsMC41LTAuMWMwLjIsMCwwLjMsMCwwLjQtMC4xYzAuMSwwLDAuMi0wLjEsMC4zLTAu
- MnMwLjMtMC4zLDAuNS0wLjdsLTAuNC0wLjggIGgtMC42bDAuMi0wLjdjMC4zLDAsMC42LTAuMiwwLjkt
- MC4zSDI1LjJ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
</data>
<data name="barBtnMgrWorking.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -872,6 +828,24 @@
DQo8L3N2Zz4L
</value>
</data>
+ <data name="barBtnEvaluation.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHACAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iUnVsZXJIb3Jpem9udGFsIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6
+ bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3
+ MjcyO30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI5LDIySDFj
+ LTAuNiwwLTEtMC41LTEtMVY5YzAtMC42LDAuNC0xLDEtMWgyOGMwLjUsMCwxLDAuNCwxLDF2MTJDMzAs
+ MjEuNSwyOS41LDIyLDI5LDIyeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPHBhdGggZD0iTTQsMjJIMnYt
+ NmgyVjIyeiBNOCwxOEg2djRoMlYxOHogTTEyLDE2aC0ydjZoMlYxNnogTTE2LDE4aC0ydjRoMlYxOHog
+ TTIwLDE2aC0ydjZoMlYxNnogTTI0LDE4aC0ydjRoMlYxOHogICBNMjgsMTZoLTJ2NmgyVjE2eiIgY2xh
+ c3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw==
+</value>
+ </data>
<metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>179, 21</value>
</metadata>
--
Gitblit v1.9.3