From 173b24adde17634d172c111afd6c6f3341578a03 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Thu, 13 Oct 2022 15:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.SCADAControl.csproj        |  24 +++
 .../CustomerControls/DateTimeUI.xaml          |  48 +++++
 .../CustomerControls/DateTimeUI.xaml.cs       |  56 +++++
 .../Fonts/Quartz Regular.ttf                  | Bin 0 -> 48120 bytes
 BPASmartClient.SCADAControl/Images/1.png      | Bin 0 -> 212 bytes
 .../Images/日期1.png                        | Bin 0 -> 490 bytes
 .../Images/返回按钮1.png                  | Bin 0 -> 274 bytes
 .../Images/返回按钮2.png                  | Bin 0 -> 265 bytes
 .../Images/返回按钮图标.png             | Bin 0 -> 404 bytes
 .../Themes/Generic.xaml                       | 204 +++++++++++++++---
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml  |  17 +-
 BeDesignerSCADA/Controls/MenuRunCanvas.xaml   |  58 ++++-
 .../Controls/MenuRunCanvas.xaml.cs            | 160 +++++++++++---
 BeDesignerSCADA/View/RunWindows.xaml          |   1 +
 BeDesignerSCADA/View/RunWindows.xaml.cs       |  19 +-
 15 files changed, 520 insertions(+), 67 deletions(-)
 create mode 100644 BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml
 create mode 100644 BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml.cs
 create mode 100644 BPASmartClient.SCADAControl/Fonts/Quartz Regular.ttf
 create mode 100644 BPASmartClient.SCADAControl/Images/1.png
 create mode 100644 BPASmartClient.SCADAControl/Images/日期1.png
 create mode 100644 BPASmartClient.SCADAControl/Images/返回按钮1.png
 create mode 100644 BPASmartClient.SCADAControl/Images/返回按钮2.png
 create mode 100644 BPASmartClient.SCADAControl/Images/返回按钮图标.png

diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
index 038a4089..fa35891c 100644
--- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
+++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
@@ -9,7 +9,9 @@
 
   <ItemGroup>
     <None Remove="Fonts\ds-digib.ttf" />
+    <None Remove="Fonts\Quartz Regular.ttf" />
     <None Remove="Images\03.png" />
+    <None Remove="Images\1.png" />
     <None Remove="Images\2609.png" />
     <None Remove="Images\api.png" />
     <None Remove="Images\biogebj.png" />
@@ -50,9 +52,13 @@
     <None Remove="Images\左2.png" />
     <None Remove="Images\拉出.png" />
     <None Remove="Images\收缩.png" />
+    <None Remove="Images\日期1.png" />
     <None Remove="Images\矩形边框.png" />
     <None Remove="Images\矩形边框1.png" />
     <None Remove="Images\系统名称.png" />
+    <None Remove="Images\返回按钮1.png" />
+    <None Remove="Images\返回按钮2.png" />
+    <None Remove="Images\返回按钮图标.png" />
     <None Remove="Images\退出.png" />
     <None Remove="Images\顶部线条.png" />
   </ItemGroup>
@@ -85,9 +91,15 @@
 
   <ItemGroup>
     <Resource Include="Fonts\ds-digib.ttf" />
+    <Resource Include="Fonts\Quartz Regular.ttf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\03.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\1.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\2609.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -208,6 +220,9 @@
     <Resource Include="Images\收缩.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\日期1.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\矩形边框.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -217,6 +232,15 @@
     <Resource Include="Images\系统名称.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\返回按钮1.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\返回按钮2.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\返回按钮图标.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\退出.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml b/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml
new file mode 100644
index 00000000..f088702a
--- /dev/null
+++ b/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml
@@ -0,0 +1,48 @@
+<UserControl x:Class="BPASmartClient.SCADAControl.CustomerControls.DateTimeUI"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BPASmartClient.SCADAControl.CustomerControls"
+             mc:Ignorable="d"
+             x:Name="main"
+            d:DesignHeight="30" d:DesignWidth="100">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="20" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <TextBlock
+                x:Name="time"
+                FontFamily="../Fonts/#Quartz M"
+                FontSize="16" Foreground="{Binding Foreground, ElementName=main}">
+                14:48:30
+            </TextBlock>
+            <Image Margin="10,0,0,0" Style="{DynamicResource timeImage}" />
+        </StackPanel>
+        <StackPanel Grid.Row="1" Orientation="Horizontal">
+            <TextBlock
+                x:Name="dateRL" Foreground="{Binding Foreground, ElementName=main}"
+                FontFamily="../Fonts/#Quartz M"
+                FontSize="10">
+                星期一
+            </TextBlock>
+
+            <TextBlock
+                x:Name="date"
+                Margin="10,0,0,0" Foreground="{Binding Foreground, ElementName=main}"
+                FontFamily="../Fonts/#Quartz M"
+                FontSize="10">
+                2021-11-13
+            </TextBlock>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml.cs
new file mode 100644
index 00000000..4dda3f9c
--- /dev/null
+++ b/BPASmartClient.SCADAControl/CustomerControls/DateTimeUI.xaml.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.SCADAControl.CustomerControls
+{
+    /// <summary>
+    /// DateTimeUI.xaml 的交互逻辑
+    /// </summary>
+    public partial class DateTimeUI : UserControl
+    {
+        public DateTimeUI()
+        {
+            InitializeComponent();
+            Task.Run(new Action(() =>
+            {
+                while (true)
+                {
+                    this.Dispatcher.Invoke(new Action(() =>
+                    {
+                        time.Text = DateTime.Now.ToString("HH:mm:ss");
+                        date.Text = DateTime.Now.ToString("yyyy-MM-dd");
+                        if (DateTime.Now.DayOfWeek == DayOfWeek.Monday)
+                            dateRL.Text = "星期一";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Tuesday)
+                            dateRL.Text = "星期二";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Wednesday)
+                            dateRL.Text = "星期三";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Thursday)
+                            dateRL.Text = "星期四";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Friday)
+                            dateRL.Text = "星期五";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday)
+                            dateRL.Text = "星期六";
+                        else if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday)
+                            dateRL.Text = "星期天";
+
+                    }));
+                    Thread.Sleep(500);
+                }
+            }));
+        }
+    }
+}
diff --git a/BPASmartClient.SCADAControl/Fonts/Quartz Regular.ttf b/BPASmartClient.SCADAControl/Fonts/Quartz Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4656092298226a3083770189031ea8bec782b127
GIT binary patch
literal 48120
zcmeIb34mNxl|Ov$d$sR-RWH?D)z#hA-BsP4)JvzcbkY^J1PDtK=msT$kQE6ek{AJz
zMOG0I0nr%*5d>rr0T)0Wb&y?9K*+=earwKBf;ukfnC|a)?tQQ7RWIm_<IH?xUiW+T
z_IJ;{=bm%!*)9np3eg<W>As`Z3|7wm*P-7L-Fp(w9=YMP^*b(mr0qhY+do94|7gSR
zUAgYpi(834{tT{Pvw6ps)9(1jx@(CXN8@<omThNk{?uK=w-7mhLv+J6TQ{C|=D7#`
zRKxr3BMPqAx@rB!2iCmfd${-KSm$rW3HM?879!D!<Ib(8?K*SY>n-OJ-E|SZw_@A&
z4eM!i)Bhv-$YnTQdD{9jcZdz*$GCq5?$4dR{<KXmeBd+h!ZFIE{ba}XoxA#fU;Y}=
zM_<Ib$9J5uX@^mWycOm96poh=!-}<<zw6o)!y~`NJAZ;RbjL4m_=EL3`Tof+{VDyY
zIMzv%PsnHVpH6n+)OT_Hz4}w;d45POFUT`5&=%AsFB*BMN<Qpum*3?tCk1N4TsBh0
z+!GWa)UI4KJpBoCU#BApkjuqEt)gn~JE<zpG51|K|8%V^{6_u`Z(Ve~xv!C%K4$Lg
zRHT10_Z<`x6?5N7IdOuy@51@d19su?;!RvmwXe#l_EkC6zAC5MSLIaus+?+Hmh-^v
zJI*@elr39#<qkMw)9D*GZOa{c`sVFtoVI>f?!fKawr@FoQ|^$}%X8hiHQP7uI%55)
zo6evEX*=zpv*-*u1vR^sc2SNFz|kf;9VOdD+i-j+_BZ3cGw3v0FYn-|wqf0ZE1Ph~
zA+(y7<F^~@8l2yZyN<xUr{d}vtKPQ$j9q8bDta5voPjH6uimufZQItLfrmEX6>r0<
zaADcDT|3X(nLA|r>ASXXIb;2ft((rs83RMPoO(WIJ+utB@1mV3^G^BY?I^=8S(Y>K
znjL@v-^3Mz251PsIs2D!)bP<M@3xh3>YcL|Z{FZsV{oBC|M7Coqd}UBat_i$GE_<W
zEhz0J>2EA^)#-HT8kKh+oV!o&I=HZYYo@UEq=Wj)wPSUd%RMytr3JD3t786w{&FsN
zUv)w3J~5w9_Ls$dhwRQR$CHPw-<ms)UsPCdpVq}UY+7)9e>G$nl}aX~>qJdW2h)`g
ziOGw1AH4OT%qIm}yYxv-ZXFrkcgn3xo^i{qM{d3HyiezQ{Bj$R=Yw(^lH0I6ACcRr
zygw%Q<8qsj+oas4<TfpzYHs3pw#YNBa+{UUw#jX~Jd>06<mG;cJYSG!I_0)Yp6{01
zqCC?h@9CA>KDjN)t7W<EmuCj#{-7+w9C>CgpFzFY|Cv5$OntOh^&I-Po0e2t+zx|W
zPD3~y6<u??DuOiO(kX-L+&ws)q0y1i5ivNjZ-iHh>>I)V+&K?;$XPO?`DhVqMf-eZ
z-^cXapT3K|eFxziC4A`u?K%04N;T!ygh5V+(5d2f>AL2kwfF*Fy?Znx2Gb+^((=tT
zV7++ANb1qyXlZP0?1mdeQfwNVaLBTY*XS4Kdxxt{C^O!tq0BC)rVDaAfEVqxlBY*T
z)3&mkFOTEp2G+{xl2P&6_pqp1iD)V9OVmQ`^!4hgv5<qBGL=+1ooe%C{grlatH;yI
z+e!<**z9&Ur_z;xyq1VYg2_N2iTkZ<+16N8a|)v+lTO5))Z5+`2|Jv+5eoXeE~hgb
z@OyN3pt&ifCwmBm#6SO_9@O^IfzYGQN3r}V^k{8A^d~+wF#QzYA^&iR|Ku_D#Q+vS
zokLrV3S+o1Yz!N2xw;E(18ZRztGrb4?d;s?-Bs={Z^OEik9<4(`}?<H9p2Wt?T7vM
z^uL6q_5<uGO<pD*(~lqrxLuf%l%+1T{8QBpg;b#<*Pd-@PElKXr_<$aN~gj>e@|;H
z7Vj?QlgW6urc>A`myDj6k@R^Dw=0%O8?9ZPM&23m#2tEt0{%)+P$U$L_w^?9c%|4K
z)gwK@waMI>RtxVQts_w6<q`bPRR|i{6WK$9z}bDkUPf8|6Vcd0{6|JcYFkpLuqCc5
zxuDiiXJyn`d}uhGbPpS8cOgAAoD2(jT$Cq@ZXLg<&cd)fTPl?fSoQp>RnNaNR{Bb*
zTzYEV*Gql#=FeT<yI`)dz2m2&edT_!^Yv2c@g;+UJ>Pn^^m^&t2NgP3be=iZ+dnv{
z-QG8M?%3u7N<9bnqBc{IH{K3Bcaoo?l$Kb@bvu`aiBz%TR=H3_r`+#~8@j-%3N-zC
zs=r(gl|J5Ay61C!<?_U9{dbp2_lRZpZ~D>1vtQo$$oFtLSiYxJzWZ~%{kUAdyIlIX
zc;v3W(w!v{=<n}+=&n-VUFGn=K=E+VIdSpC-J&}2rLA|CN_XLUZ_nTZcb2gm>Fw=@
z1Oy789SaB?<dwM5LU~9a{q))D`mT<6(B}_zH8nX!M=IqMk!YenpKovNYinz7b!gO=
z?>7b<#(*<#v?Yq&Eqb%jS;*+=SU6<(V^Jf~+mqE>E9Fv7Z})mYPbw}aXiLCP$;1@8
zCHqvJ!T>wWZe}9Io*Gg}oG|erqA&!ftS&SFbQm5&RqNc^3I!Me+yzz7s?LEAIOA3b
zF$R<<Wy{Z(t$*Xt@pAdF<4fiK@IddH74tV^Z`13gXG>xs<HcmT+_&$6zP_?JWni#p
z)0_MIPZ$i%0j@mL)B8*>OLi4dzl$aH>#PO=H3=rxAhPX}N|V*^fxZq#Utnh?F`8f^
zhjw6^JZZK_h~l)iT8agnK7TMAiJ{URMj{k6{LzRJYpm0FY^FLjIf3d`X0_3P>N|<4
zmE|sQT@^}Zm29sLmdk_H?G3<>0roM7>r#sTeq%YqK1Vbh3;KPa8eSt2@Eg8(%m~X?
zuXvd1N5T~HWrWYpvub=r(gbekspa&UeH@L7-p!4ta|2#c0^=#&xeTS;u>&O)H$7V_
zy*}~l$1AUw7LE0lwdcxxJVr=~o5eZW&&^)Cv04g+17Jx)(}dSk@w;69s1b6z96(K9
zI1;V|1EJ7bzq4ecUy1`ViF!Hm^4!6ZJ<JHLcC>!E=xEazx9O;0k~B2jF5E?lXDQd&
z#kXD2d#1bmK)GBNpB`SGopZ>+M&^Kd&3C>l-*I7%>$HzPB%aWQWN+lQKe;;S1mZxj
z5BlN(w+qbE@On_tE_aZ8v1mvSRw7})?u#bY`sUcmYp1s;u*tLrWj8Ww7bRr`ko^Lz
z#q19#Y|`D=v#o#Nh`wu!+c%Z_#>e}_64WLt`y<zs%cp+#)Z(>e5|h84yoJuD8&JP?
zEJxXzXT);QXLo4u_`!95z(7uba_$w&!~mXdu6i_d55G<w>OqB^+%vdXsYSn9w08^`
z$IlRCcm85~)sJqbqXF?fo9shomtwgg1(Ad$20Wz=%HHUvIn}5`kh9{}beBtaIq@p>
zwCa=0l}+A^7fI0xbh<?tdg_sl|9s>9n}5WlRNTX472`MbRPmVE1HzP`CUo$#sw3GT
zdTXe;r7aeZ$PSwmi2){wtu01dDhcjbfw-Z^8@q3N+f3cJktFV^F~=!Age8ZmWG~HV
z$34bmJ65k|LidX7ITKGylGo6^%Y83BE;|u(z7VJ!YVcXWSuks`RE_C22~nf9?#!8F
zXYf=L55WMVC_waCh=<~~m&PV;o%q4GOB1(3`Or{zjOk6ZyE>e9hCD83BAEfH1IEkB
zYi`OIsboyjJE!6D`zo;z6IDo&E}BO3r2JbKfR#{T@(#1kn7)_<u(?)kOjBfqF?Go+
zj=>eS3AGg}l_ox1{=w>ruRv_TzpO8<I%ZYX!+m37D})6=)r6Y*h>a#T(e~<4I!s=T
z^n^DMi-g@CXUH&Na_9yDuCU+d(w(3>Ufm-gHiTzF1e1=}0h$60%R&rJJg=l6d(%sb
zS!fcS^_IVN4FH??j)aHFq^;4Jaw>QvFOnF}V-S{b)>OO0sP+K)Q0`C=9LT9VDt@0^
zSK_^(wf@XhGQ@47Xgrsm%gsWZ;1Wwx8BIgZSD2zoS{i#57&CFUES=aX){ebYM;=wQ
zSurT=Ca22-6hd8x0?deN)y-Ay^+*&71|YdA44PWo5`$_ZsCs?Z*^-4owJKMlMjkRo
zt+$zguwWqyt6A8bc;A{I)T&%bn3LtPegDe+tX}0)sEX<t?R0K+Nj5EofM%xvaPeqZ
zQI_^LqqPMc!tke(Mh3hq7HuReO_`an$u>s(a}Z7?Ee&8wdBI&17%Wf~U9t5ROL8*d
zWx8UvBlH94Ggp|@#ZL!R+dR6@E19$3XLxM1#_J(PYcf32tw{}+4m|4o)1%y_flvXD
zvjp*9k{yAfiusI5yTrNU&x_k0AD_5iQ6TNPF&-DqK)<`_J=H@BiiGE!!bZirLB%od
z>Bvj*_OGVpz_Zb5^xTeG-8JH*@QWp$sWiP#s4Nk-fwIrg0u5c=)((x_%)-0#t4p(K
zU)TYZYj(JmU>A*ry+%$U9!q$j&&hZUVu(%5OC_b47oH~O{UwOU#F^VN7nW_=K*=Oe
zV`6P$p4hH9nWAS;TeYA7pDGW^UiYkUL4coll?gU@TNdcIQ@jX4z)eHdCRTtz(*g}y
zT?yiZvci%vYFKB}uCNjWYZjOWB}nzU>+oJB9hvW4Qf;n{0vz(~f)yezez6jkq~b<t
zZT5^<;v}koMGzL8`28$AmBt`GiJR~Vh(C0;_!n&ql<?4M8sy9gwrYL`qjKR{>ujqr
z=6#TF9)5B~`+0r{I1fMZ>$V^IrS<{4-)r$h<iWRG%ssl2L6NM8+a{hDgJSEe%kQ{j
zIoDE&{vaL`-;lLbuEty-K2}XhD7uy8rUv!aSd0rlicZ)yoOhS{#E!m+t9ko}@$t)*
zJl6n$1_&Gur@(N@=_CyYp0(5nLFmzk7lc%K0nYG4CO8X142}uG@KC=Pa#qA3Ah_*p
zF8`~jA;^H@Oi5$B7`MbQQU^tKha65%GM<8@5sg&R@pu|zsxZTqP8o?fn495*xB)g7
z<*{o7f;e!TMMmM66|ogLWhLCD1I|Yse|mJvcm~DHIG~baq>*?myR;KS)*@r|Y2)`w
zne3HPdE$3t2Vb{p)sh=-&^`)`l^ptGUs!YMGyQ#NkwugLraiB{0t>`uI;lFic78HK
zp+Y2F7&5jLi~~<H{GN=la*nZZjiEb^s<?V8BSX2$AqR#QX2pnE`cWZOFN6DN6l#~j
zeZ0lro)IWzWGCcaxMjpy>I#WMNB7Y1Qq8EegSCZ)E0Ij3jLK5y(7f(KM@UO1l5Gwg
zYr|=`i|?Jc6o;u~BBbM}m}nEYsE=y%)%_0fsH-xV-stcdE4vrAI(&1AK`oSXCtEt3
zz1mgV{Vlt%$5^N1rju8{DKtNwYT9+(2fy5X^!ck2!3*!vVka!|7b|zT)4eSn(MTA2
zO1-_9?rlwY^&iC-4PMnbdgAbW-{Nl^4+T}c-;?Y+cu`wu_ceO-v*-D|!Myvz^XL1@
z?d`2+e(&S+H=VZ9EAG8ClHY!Yr?NiYKDVQ-Z%N4Cmku{AZXaASRJ3tqB?X10w0eHE
znvOdX4&nDetKoEkWd%c_pa>5rd6jt=^o@F;5|4#-j4m04Bvk<$BfE@L=Vo=D##l7E
zM{%}G2ON^YDY;2<ITrK`h)p`L;Bvqr#qlIYu{L&vICl(EM_r0qTl%)hilfFK7p1Y6
z>Wt9j!gXHAFa{v$rJ&2o(?_bS+Z{fSzttg{GwE<77*NorGq5>fU~P1e(IKJ(`JB;~
zje#3@0DU?h<8f&+fssxl+%4%Dg%LYZRgg0tHb8IdMJA5~YIdL+hHKR@ojqF8Bv(gI
zUH1L(cwP1liK9x-3T(Mz8hE2kCR1|ogEqPTze^{hgLFzxm$yc5qBw@qKR-6{jZLpt
z9#<+UW@$<-Q|IFLcD$;(f*Wz>7HlP>6)pH*(sqz%W^Xq+ENuNVO{Q>nYGb`|E16>f
zZXc_MCTT}?I3D&oBDD@02uhSC3?>ssEE?ku3b`3d6?@MN2WH~*il{drq#DMUl1i!p
zD%E0k<U?N^A4i*ACPy?4(2VW71cPHad{nwWQHLW+$5wj)M4$$Q8g+5e8;cEsf-!iV
zlJIDe3vJ5AmRN~C!y_&`>98b7lVq5Jlbu>9QK^nutSPqS!~eD85~b~}bsBRBrp6_6
zRvo=+)zJ-FkLlx*x`smGR1|g-@Y!(E$IT)91F9(?CFmZII;h}mE#joL4J5v<jk67e
zNB1-gg&BvehT-9`vK268=RWbOH5`6rOsK{&2gQEKu|Jbal}2mce@0KkA8ORoD9Xn=
zE~{s4sLnBaQaDucdpv$JB5uJQX{s&&#zXWb%LHWF5P5W6Blm-#7Y&^X_!%*~lBGN1
zYB2QyyU>MH->FJ<z^|VzP23-XC^@~Y(sV|3emLppwu&bz=@blvv7pst8nnKt<bR~e
zAQ8dvhr;9663-i2FJo&xF1qUd!$ZSH(%sO0`oE3-w%&ph_jA+9?!R^E&ldlJb->oB
z)T(jlfF0ASTva%0Uh3ovSU0`GWo6e#T@BSODY8}JEK6|7RfS88t5<l4bubfOvMOAS
zoprB?7c5bys1^F#yQ;^h9PLekKyx}0t@ylNUq}fIO@UU?($*zn1EC-)-tYu05=M!5
zL=RV@(DCWfW+@@1^Eud(Ds5TVk{~U0H1wsBI+csOoQ6I=&BjFRU<KLZpV2)SS>w+F
z))K>EQH16RNLH}57RygXcfkqJSy!oShuDMqUNR%?k@4pjF8sRI#lqBPwiRJ9TTqEp
z3l_Ze_}Ih)O0yuYdZj$@a(?1luNI51uCQx5t@e!5w(9)2W18IfS4xaEXqB`m;bi^3
zMN{l@q6Ey65F22ziH2m8e3f<Z|Eh+&k$$lBo2Iu_7bIC|iaA7G?1h}9hK4LHg@Tpn
z6#2FRQR{eWbw4HBDy*~#w5ICHPD1pW7FV$W)nKMrWGO~%Oxl!OnHg~3oID>^B+I7D
zt=5K4bbIv}(=d@$hKX!zC7;XX^SMepc01bJI~+#AG*#r<TXk3~vKeKs=*Yuj;hbWz
z=qT7Uy*6kSeFw1IDW#H2fjq#r6^nW{>g3HT;C}hWW{d*ZLDFLDEC`$WuCJ7q9Dn_B
zZ{OO$)f?n_e{pQ=<Xw!@lardmq+F`4Tj<8>a$9S+WGc-~P0i+5r%B7Cl#E<&`<59R
zzj>BH9k_<n?5Nh4<7-ncgA!vX{q1E^C-d}A3t#llpe&eKU^ayVBVL>dGj^}P@%jcK
z(}o_QiDx(2sZw2<WBW@u7_h0&-Lt9BVaa_1?fGA(JZCyA4Hkb!dp@*wuhgEe+xr)2
z&-F<*F5ZIHWsi&)omL(4JDs}AqeUXvM*Lc<Prx++BXT1UF#;H$lg|sgG}LiW_%ZZo
z#emX}*ad27_HAG<jKG$Q3P6bmcq}@cjw;Usx5-vM(hnaKm`-03cOJZU?!0w_LK_&E
zm>3k-y*N1dVxQPNR)M~&#`7KU$WS<mk|+JnSUeT=d!?#BBLV}7xRHWulJ14JHK6-F
z?wU^pgspUHs<5Sae@)z)qHYE&l*$CAJF3$`0$|B=ip@|OV@i#-La}zu-o0yJ&w~tR
znh9BQnVbaOd88&Qo>VQlP`y%242CL!a5&&`5BPmSw!TAf(JHWaiNH)IBbF28%5oR8
zw$Ps(pdIo@@o<(~;%14R?IJlmGz!%Q<mAn7U7cF}R+x>zomtTlXnX&s#i!m6MX%Iy
z=svUW2cgHwK*!Ndk5xB!2Az)f=3G;Au3PJf_<Vj(YcL*%4lU*A&cs_Idbd%`7{zd)
zl+*{>vh3=TYc+BO=ma||8gyQIs^aMCM0@y?3E0Fuu_zj-5)NT_;DeDgpR*|qcaM%(
z?sRV`!boKtB+e0&SX$`D!#S*SRHszsMW__n?2$)>NQI(_g<b3l!`?2e7|M6Cc}n}_
z_`dx3FG^)#Ww|tQ^;jufdVb-e7s{o5KY@_bD{lHW47HH=zU_E*#fn#p6Tf~rpMRxX
z-Z%e=Qn-K7qEczYlSBL9SK*La)eoC}jd|w9)x{~;-{JwEo=j9?{<O=L4r(G)i8`E-
zh!aw`IwyNvJciB}4#B?;>Q<-Ju$z8>>5)AU<s_pp4f6K=n&X^#jctiFWu@eyLvaY*
z(3q!_1)wwZtnMKro-CxU>OXhM(s%YRJ9p&D{{AbM9x9TXU)QcU=#LvW{&D%lPtV>w
z@l)u!>+&~y%dup;y$Yk6AI@=7>Frfca83eAfz%2<;D<jGya<8K?0>!10RrN;2#6f`
z@v!0LsZMX^V8Rju7z(B$@H!cWYFIk0K`u4%`>V$dJgiL5K=8`H|9eG_7!1oW%B6OL
z?%ix+wjZ8ctE*kXfKDE7#piIs$HndQx#5H0W%YIt4dhi$n9z18uSTW1w^y`e*Oo3n
z!a8dpQ9eG*{t$k)t?lmn;P}Lu*KWSylwIro@imd@x)H<2!x9s>h$n?-;zqGy%&bk_
zR<0AP{XxGY9FR&=l#bPi7(${}Jt&@C8v|mD{wEC!Hfx_Orz8YU&;yorL(=xgwPzp7
zuwFxlQ;Xz}<JqyNpB~HFc;dvH$Hv$QDD5ajugMa!9}879A>gb<x~9H8&0EWe7b>IY
zj%v^Co1^NTUTK6c;L%|=a624sU<W%Hx$E%R>`HG8AH&7)u`{Vu#xr~{Zt@U~$0@K1
zN%-E4VaeXH?D*49k7r@;VhbnypX9i>2H(9}SX%=wvmACPhlCIGmz~lahG0994l8*d
zBLdJBJdTmz;qSF92(e*E9<=@Qf`ZLTG~6Nzeo=Y#wH0^VelKiAZ)R%?*W~06#XrKH
zrc+zhr=t=zfsWl@^Xic(&VD`Vp*)OCTU%OM@Dz!+(1*nz@sz#(@qDX#P~s#?f(qbg
zqi|4Lw``sG<JGqDNqub9MEf=K`!(}_dvD48nt5qPv60jn>?fvVTi0l__xXO!JoA1v
zB(7NzK-~6g=AYlMnOB3gX&#g;#q8J2bC{Fe)08a<`!)0XHS_y5^ZPaP`!(}WKv>~b
z`!(}*t0)YJ`!(}sbnSl4Jk+84HS=M3vh3H)@7K)l*UbO@YUWv6do@kyRm#y3)y}4j
z$4!XrZ{h%{M4bJWv#lJjTS1tetGOvx_v7N=n|*aBE-2)sep)Jb^K6u>%pZ!*TP%`=
z4p%aoaJkzAep2!TE)0lDOX0|>zmVz9X1h~e{_2rszu4N_CXPCwE7LWxx4o?E<@Sla
zI5<EYH7CItemHN=Tcwu09{CA{v1J{=Ft8T+88xC6rJU#IOc?WYShWy~3J$l6DH8~X
z+_kr*^^~{L5|6p^$gk6oNuv=&%MQXW$LS$Mf;fM8Kmed_Sl-yxJqjoHbckUsRQ#Rk
z?zZp{pj*~mEc@M&fg^TwrMpEBfYX{Qq6ffr<R<PPOlm?)4NlyDfV4!2PVo=o7I;!2
z-$#=H=lD3xrjc+<D@;q_kR#F>r+mGX@bI){&0yCjXpyqq0z>oW!%<&@gZ_Mk&?Xb`
z$RE_;rymxTIepo-BLay)B<eH|f{8%ZBSdF(XhAUNbS0a;5#DpS27D?%0CGpXvu4xf
zNX;y)rngp)oyq?_Eb?tx7)M(Wj@Fdvf=?6VFL;-<G`F|G+hk^sc<F2+rZ~@VMi83;
zTUmqA&eDy7$Ng|G8Jyzuq%5M+s?7~Glk1am%;R_(4#7~~6OFF&@$o~)XY+}Yb~o|4
zcVU5bP<rYi50zzoNTP1qWp0hRuxY_|XZO!HT{d94Q7&d^7|UZ_g|sVEmGa6mU3^{{
zn|QF;+3D|I)75$GhK^$KuJZCy+sS6>jvQ0Y{O~=id4cK&9NpEqrf^%a*m2S^on5QC
z5WLzd{XHg6mY&6yzXy9b4cqeyq*Ikd5<wlwn8V0$Kq0yc!fP9&3Db$DI{ww8@T4)5
zo5bcGX<0U9o1psuH|w4TDvZnWZRZFl%crOA-`=wBgmp9cxZiZ~#g=E<gZjA*b^q?_
zL8i|)a=sw&vB~tYtGRw7k&BT=Vv1zK#LOuU;F+|T!2!IEaez?iZOxbr%QRI}<62HF
z^{529GdL%Ds9~JVAw0Zn-2n}X^tw~HxcBO-YrXKo8nkgU*T{?2H@79S$+)ArsnU|k
zv^2L!xB<RAYO1uiwzfBV8m2w%p0H3IbLQ@t5r2XAGJJP!9+uMQ5bjJr|NbLC_dojZ
zlH4ym{y#muWbhY59B20MBhSaag43~EmyB38MY}JUWx@xF<Yw!(>ER-BDHM@bp<abD
zzUA&UzD23`4PUXvcTDGO-Bx#I+PC@pPbsZzPw%8!eZCX+Th4l-v?m4RJ^4^|)wJmS
zo`fiN7WABvX9KmLIP$a50b<tGiCi}`$Mbi0b?AA~7}7r*L1Q1e8a<mWz#qZof5tNo
zh*l$N?4qhNnlyxihQ|&Yo83W<gF&@_m!wU3%1F9z(F;ZOFRw07b9}xPoZk_$(fdrD
z&dZz>aGO9Jkd1&SI^P(P{06n6D11YWn0|sX@TZpL1x_CJ7||*9@Txu4K?JnjRs)Th
z4ou+9SSTB9Q9SR1)s>3lp_64>TeFSbDlD>7xZcd2tF>h+qif`IHvTr1y){xB<-FB4
zTYq7PAI^C*rMIY<`YsTh+4_oNaZGk>SYUCuDK(L8uC%tav`(vuR-@U@|7Wg=mgfJ?
znviL2rpLv_*_FWNNINYyPFqr^zgODmuj&sUs~(eU&b7BR&kzb27WO(ww|QC<t;$;;
zQYZ`9AsHFiCS5{W+bXU3tTvVKvY*(#X+C01c@d&%@uiuiAk!@hH1*GjLdI~hT^Pk0
zW3ojJp78dinSrI}-SUPtB<@|japU5fY*e)oTlUL}?*f-mvZ9@XD-1%$(y5Z73`3Cp
zSD%&ZseWAk3wWRE&yU#|;C{)~qPemUNtd$ylB;sZ{;!o>Rn*{vw(%p6k?L}KQwph&
z(wXUUI&%KJft;RB{Y~X`Bp0g>#%ywW63k*2Ii1;r$uA$&>wJQt&C=!7gIb$2DU3~8
zTc$^(W<5<Q4;gK51h2-CT|m})AfXlEsYFL$Z#~?}9xkptW0i9$%L+3$ua2nw;k1nh
z*nr+}V`l02;`2T{3*h434{uz&crh|<DY@xE{q!1_RM3B<x@tDan;C9IRb-~Z-jqsb
z(vU5hA!#X|DY;}*#@!I%RvUq`c7VIFOv@(4X;m-Qkdy=H%`sa&Y)_6!-=I>AAq3Xj
zbOg3aX&xK9*^EU*y~v>YS{$#qN6F9#CxF)Ko|+taV6{!x;PL8*ce&qVcx`a`ykh3e
zHYy((#z$b|oZ80n{)Bg{6zq1fAZN?0rM=2>n?CtEzWf3Ge6uAEuC^msK!)RKJ`OXp
zd7*keGk%(}$@=)zZ=1d2-7GrUzOA2sH902V4@Fki)&q{O7LimBL4O_{UZ|W1E2Md#
zQ>+JFYn(w$cp6-$rQ%1$T$sM^a*U`vy-^;!C#)TLe-30_wd}mx?B&v41%@tNdK0{)
zCtpInd_{k24MX2lEx}7#3y0j?BB5Xaj>-1gfgi8e<MX;3N+?5}fN)AZWk)-t&5%vi
zP&}Z}VlgBM$~_o>HTdypudyacX5qwW%Pt+LT%!BO_Y?n#@qK*+*Eqg^Uv<Tl(S0so
zDRguc97bnC6dFeOGmq;#rVi>YL87h?Hwll5ZB|{#LSZXrLutc0|AHaC8o<pmoF72v
zw+&`FFR3k!n;gzFIk0Nu{3+Uw>9tYFRXXx{L;-SbbQrn1zGLRv$mgc0IR3`9q4@GF
zwc!LgdgIz)0#)m4S5B#oBHdCwqO&90m3JcN7eYM{S?#an3WZ!O7!Opsi^Xn-0aehS
ztCM0uTic-bu?71yB8i0|PDD0YK`qw4r95SN0&HRO{}*Y1YGb)sD(OTF=t`iEZ(LE@
ztBW_T2f?)H(tbVJw2o!!$*ghR>C><Y<GnYIWQD%2VRSc3i&bnxyg$=wzqF6>%zPb?
zKI$=rEp%bEn)JKsVTBo}jhmZW97bzEv}BB?*#iuln?yr^VO{i6E~|171&x&oA7SmT
zjp`{h1`^9?R;jo%Bb#ioh8C@Bh&ODl)41s|hf3P9AZ0AIq9><AYR2>`NSlq!?2tBP
z{^pQM2?}~iPIGBRRz~XdYdWO*JL`0uDOVlNcEr0ZZNu;)+1{3I%Gev%VdMg0b~szK
zKOZv6?K!0#L5<9KJElskub(Y=R0lOm536+24WLRY)N<Q-CO%IGR}!F;AhB7zOHm+|
zb%w2ve-C<S6<_&XSiP<6^6#u-ejJA`94^fKA{>bj@>r*%(QqJ?Zuk2Tb&8xC$eNb)
zhAEIra#jr)WSO9~QG0B9eGsW6Y%|lk%nfa3R5!y*mB4~#X3HJ=CsfMHY>7!9YLU*V
zz6<&XF8FHS1wEw;kS?14`oxb0IAL^u@5EcgrHC>;vq$T^sHf+meq^qzh!@3(_8r7$
zr>Vah4;$X3p~ot&0Ac|{UZ}@y+3Ap)&a`XG60lht>6<vg+%Tt~Q`zKPl_Q529C5^g
z;Ui1)y1VD`svSRk<Pi%N9C75ZI-V!v{&$Mc>EkA)PD@Me?bV~>+16%Edw}U5GEHrf
zXuK=j(o)EEV4{dZ4q`yS2zMDB$adL+F{&epWC@)GWzwK*Q2JZ?I0n?$5nLPYwB<vn
zM}BgS5}Bbyrh$-lY-uXBI+hjHD>LIN3%2ZI+{;k)jcGtJ0E7!$5lz8KOE}08BSC9w
z1DUq{U<CGFS^E0e`we5T2a^>HT{HIL!oL0in<;f7u%c8xc;SQPv4sn@Tl<HG#x}1Q
ztQ<TDyXxf6knT}PPYVyCUlYhr*-js>9+h$F*@VOC&IAI!U=n#<g4rk%fhJ<%mUbCR
z*ka_Gn_%uS(kbM3iFw?Hll?4`jzD``9L?L>0(>;HCwk2m#z5V&@vDJ5n216~<|4K1
ziKvr^tekqfe=rnNEXsLRV5+b(rCGJ1a{M!*CU<XmethENCDAkf{A>M(&mBDKq;d(l
z{oh_Howa444}qW`Esst7V$R&|6QAkt|7uTo?%eK)?}%_u&l6H!oa_=`wDrO)6{r_;
z?mSdo*PjpTeWii6_KrX>g09&OUYhC6W?M1|kH_oErajGx-iY6rlQrhBK;51i956~S
zI!7a@97ih2q5Sa}vL|<SHtCs4PZ3!+$|X#}QWUP~l~m)jrn<w_{p=gv1I8<Z#OpPr
zYD{%tY`L}=o94LSzal%b%1W=gv)V^^IB=_$xd{7R^3F~DPhg&m%{=YIyoZg>z3Z?i
zqCEG+*E{zX=6>!uxm$XwRDSZ)gM;1cukS0pzx3~h(Qz{DYfqHQkC*zMD2aidp21T;
zQ0n_&=?|ErLi+UlK#YiAfDWXpE*ElZdV6Vflu%NX6Nwl~aa(scyZC}5#8%a_k6=my
zTx~_mu%79J>VPIPX$0LPF5B>V2XxJ#a0s}F#M<y}Xv(-MaRi$-rGTUv5jSfW!Oy_K
zeX>_t)7!{uMF_eoNpl<}$tUx0W@0C%AtPFd$^@751ze3@6$2A5ELy#K(egQSmLGZg
z>B2Whdv5TUC5u=8cHd><nA49wa>u?o+L`+<Bjqome;Vbj+f>_tOFf8?HO$#Uij2kR
z<7Uow)fTc{X1oHK5&5NO%8>D%S+B^sO{Qm_Hq_J>(-KlUkZJTcdZ(n<tyHFYh=*U;
z+f(T)l|blw^=xFGVYIh-nhZT+cuU4W|3FVAJGas~ufMF9ki!XNJy~&qvS+7IcGNjM
zc;L0fN_eL7R=r!AC!oR56f_uCiA1#_xRD|4sE9|6N*j`oy21hkF)1Ch=9R>vZ{Bdj
zH+da=@7t@RXRVt%_q~^np84LFPU$TV1xAe62dg*tR)$ZWBTiAbee;I*ym#*06VE!J
zdiML~zHj16@p7Ov8mb)N7B9d0>STZ4n>eP~UJr|CMYW@xEw$y1VNZ`S2wxd5YM`r9
znH^lk%0`i8RZ%a1xA@P1*X34V%3P~(eNbsw=OGR2B9WQ}Nb&pDp5>_(r-gSNy>M=G
zYsb<3Z+V}m^PHpnk+GS<om1=zu3Z~Fc1L@>JKKKc=JcHPV-d-xPt@+#z6BYqpB}7^
z_4RaTTbd%y{!|h<`kl^59$qHNL?RiBS90z7wzhmnp%U;1eZFA1zf|#fy`G4Xmoq&X
zJo$-+i5FZl??)oe=?6OUtu=&TsxMO@OFg#q@#5S;79yBggJwtuVco&<N(4zGBv&v=
z9Zv-lhw=^GHHwr4?Hc?L*&QxkfG^z8yy3837}QfqS2C<s_O2d!$MWQ<NJ-+*1KX0z
zhq^cmfY&KDhBs;sBux-nm-dmt!HFltLaaMq!#o9Xe{0)o6IbpDxO^^GARlmk?|UwP
zKH~B?T!B5HZzN7dT>HNRa}d`~f@iBhOuSErdmqo$H8rn56pWm;xu>!QSHsh%(C@^*
zN=@bPv>CL*vR>;IXlBk}r6gANh2-SRQPUv=T1Rn;R7%ScJyfqMpP%CIIe4t~(wD27
zdfOZ#=@1!*C`1E+Sl&$CmhY0<k3wP~Z}jEboAo9m+X}x)WSy6p+<J-zq$E$KMJaXF
z{9$2ltgDmxen%dBA3lJ+-3|VIBMoWXYDwG%_egmUZ7(5`8KgM<i<AYF>lF`2IFXxT
zZMCk{2YBs<R7giE5sLD=Q=Cjn1DrXbG(LXZ3hl|Ue;FQm;g$ZrzKL5_zfkUfLA3Wh
zbM%^LAjKXy{`F(Uy8dsAc5&qRW1??tc=+p&m&;F-qXV2dWuO;W0P6eFTFzvxMk!x0
zDLdztNyF+>pl7RF(-aCL-B2vk3}Z&C*Ny4VD4D9X=W^}7AaZU&<Ay`lLE=!JH9EaU
zC(oMG)NHgOjY>xzb?tIu`W&9LK!?w&-zS`u&!Jwa0B6hAjA*NKv${Wxsi9U`#g)W~
z8e}^N*JkKZnco8&&Z`rWXKW)qRlC@tf`Lt)ZQPe29!TEAS!G!CRMTw<p5q2Suy8aL
zkojNbsSb{7ExnlPc=Ef)O?;yJvEIHHwus$*6IZBN4>*nB>!tZW?=6cP%grM%b-w>+
z6Spl9eWgRSOPB9^JI1!0t^3EaHdO|eG`bAu>G@1`T`Y=3Eb&ANlDWT46A6`#rO?r?
zw;A2}oZi*j+?3Q4Mr#JO*2Y;{x;r3Qg&}(B$x2*KkN|nTE#U8L(c)Q<rFzzutg1yb
z!W7kKW^EZ9G5Zx`WdwqO^1hJLm^pUho7n`%HCV??R9rDTV?q}oWwOwP6g4bjVUO$b
zx#I>tE0erz#9(>i==jy|6RlSzk`o7Iu6VC#eqS_k)%46SdvlA$NPG63xsj24GiXIc
zbclC@X6ulM`sny-85v;QE~nQ3@inwIBREhrl6}n;OcH@)>jflX;_)JCAupmedDD`~
zK}f)q!I;6Nfd*3K21uo-5{RTIG~{NU1V89`OOfF_1x!fGRNp3tcDa{`l@p&5u|<pY
z@Ik$8+Y*uSg`vZ;&hO~ngYq4NP44iaO}$G!;<))@%kqiOuJm;D4V)T_u0A|scur1N
z2J^*2FmQOs&;WB_hVF9hyVy$u8>-bT=NRcUJXs?O;m@F4C6K8&JRu!k()A4OEZ#Bi
z9br%`IhYeB#gT<X40E}`84@9_&`}uBiV!i7<s2hRX1%Tj;)scl>%ny+g|{a{%MVO=
zJ%L5b{R=z;gMonqz15zk<3z{&`6ARYdQ|1KXl(h4upU@3zYrd%_zxZm8^f3nY(LG#
zNMb+D{a;OURR+2%rCea?7B7IVI2ek=;wg{I5#W?_;fTk`1PmCkbut7jA<;+|>lb0Z
zM&}IpAy{ByQl|sGl6A%PE~tdNM)L=ENS6C;1AUWns;qRfgMy{7wwT2@sq;`=2X67d
z8!KHl{<~Ep<JXnsd<ojn4L3~8kr~lXI`s?fed81Vrsl4K9^O8~De@8V6slZaDXyTX
zNZ2(kceX771J7`pmN}UD8~eT@{<LfY-VPj-vR8A7J2=Nl6_F)Q`C>UIS;V2Msm!EI
z%cMsQCFKkoAUcI1=)mTSt)pLq#hg-;JG6i)kp+=^bbYlL_Itbmo};Y7vz0k18j|U<
zf&mO{c_yq-7*kkxn#Go+4Gai=*6vS^zT2;S9oV9ztdIQ5HLJ?NSw_<Fv|q&2X4nD8
zL#CFj>hI`XnK^9i+?8YJc8PbcfBtImi_*k(;^XYzz*Aw0t0Czqo#dJ3ye6Dy?6T@I
zxYviFiZne8P_ry9Bk33dhuk>gEWo&hkHP`B?tsUEPQ9TZ0&tKg3pfME7L|hxKj5yG
zO#heuf+cZwGEkTTm}wYc6|AIme|qhvbrbtGow#K!b{211xB2ClfBVWS8Q#nS2jqfq
zAP|Plp9e3H3^+v=Brne7g(E(RBfiDw1>1zvfbQx>E<@b`?+WBx`Y(Wkg;<OO*wD#}
zJ^oE?Ibq|v6F071Ab&TU@X9OV#g~6Cx6BiJCx5TSX@k_J7HDBLlc}`1D%2LEK&%pI
z3G2~((l+!SL8oJdht&M?pqs}E(h_Y`whYg*-`k!}xAXc%+fFK%OQqZU)dlN3|F&gP
zxptcdztJnS=1u)~;zMj%3hh1~|8pLoR%!nC*)8Q*N_T-CvehFZXDcqid-mz-*1lXc
zm2UDzgRW?>v#YP*EEaXjVN^}ImKGf|5C?+Jfk>ekG0N=Z<c>kJkHKoXx2Ie0GWuGK
zbkXQbCXoBJ5{N}P^=n4&$g43GNKz(Er9Na?t;xaYCpAALGs!q;E&s7{f;ES7RJ8{w
zj?IyiUHxi}P}N8Z^0Q=XWu%E!@n1>{>x3Ot<?56QK8#wGh93h2z9BDmV00Rjqtc0E
zkHf^F<!ryUbNpNLmOTIRU=K#2^PgC}bkDK-E*E#m;b{m%)1P5>f|rY8`5$_EADieM
zTeN835B8S(_m+Z{rAw{R>i!!38`iL(l30TIvaSVvHfJ}DVaise_EBt@Ga1IMd9g6P
zD%yqTH~p<RSFFTSwfu>39U~p7F0w{0{Nyl%h?Lm++wpN|ic(^)7&7ID!>V~mU=B=Q
zX0k7^Vb(j@rd@Bbxb1BG6%2uuM{JH~UX;SLV@t7$y{}{WZ~q=@MeL=UBz&A7QgLNg
zC}M)5ne=E}ZZ0#Im+SPec-rzTSOB?4X(Cdvhh0})j`=$gMi{6kg@qKHbh{v(b+O6;
zS{vMe9O9fI773d%DY`vLEOd?yNn$O3!djA8CNENvho4%chuoJ&9v0^0c-&NUw#=L~
zR+#>)4as9CKF6M`(-jHgK&c=6`-51U{5HB?v)O+zKd?>g{tM;@E|~KJckUe7x%QNi
z%WU%lvwiA8alO`r-1`HZk2ejMc36z5y(Q%9HnJUMBhcPkLA1E;4JX&;n)__#V|aSY
z*dIAJo3t1xizhcZE93^zLq`Rxv5TWx8fNkIa4PMFZQPv>Yeg8yi!dED*vPBd)}=v@
zyV^Zxuxn`~JlfJa>UKw$b`8$yT;>TLy0E8b!NOwq;yt6?0|Q+nQIC6RYwKtrF@nS5
zsK*^1ZOx9lLLVwFTv)`)bO0l(Z<-^4k!n+2;AipQje$!qPYq~g(H+H<*;6TwNoiPe
z$LP+Tf}p+;0=pE{SqDDl3w2RkO{ng6b%V}XSpYx`X8nRCQ(LmMDLqSU*A|#<&-2@|
zCGmplvT&0*aSV@L%-{r(G^hMw*&>}{-F8z3sz#;tmP1Ntho(*KW(g6EgWvkxZag=M
z*`cL?Fm-A-HR6Q{P-gwD1!<Y{G_B^mfcEe;Ia$-D`fRzT_UW7{FtQH~=7R`((<z43
z1hK8X5=$my@NvjCH)mr8CfDOhei`6gJI{((1A3}sJ^;_R&8py+*43Kv8iY(qPE$gu
zr-m&6JElgismc&$WIZIM+H5s)zB^l`K!eJ&*G#XQiLaV7zBQ!Hb4#7G-PcB0`R}NX
zXPR1Dnp)v>!}fjYa?>k)ZW6t|bf{N4+(09OL13W+x_H?5A#)~M^fp)C8_rOmrwC6R
zXSf1uNG#|KbiaWwj!Y3Qr<PY*WrZ?4nT=`l0Nt-!K9pREN@B~0GUKbQTbl9VSO>|H
zl_r+YjxzGk<gN3=Mh~98Uzs+Jk6c?SU0W1`7Zr;amw#xU+#-)8XU)<!@emksJts#B
zs#nRCmF5GblY$P^H>oj^<@wnEx_RT}ys9E9=YV%3r^g#eJD6w{v;otrD&4|V+G8D?
zGzbbxDedqit1RtcnpK{sKE!yTKZV|7`CzrwGCT~^5;~9$rK3#Sy&IB;GKr*<rfOvv
z+(BT)JW#B~ntt7O9worj>dsVecXyz8On3LO8@hUWK2bcjySV0?x2}9);`Ij(f8e?L
z#m-)J@t7a;xt=w6peS!X8IOra?&>SuSrP%bTRe1Esqe0G7^M7gp1XeHZst>4?<|$>
z!u8&s!3XXvV>i;<+iyGh3wg*F6cs^)LOrs{$^)`L0v4(<GXhrG0sp?^zaFc_JB48f
zWerD7)AM&0H@`m;&WeOnql&+mDA518xWE0;cXDj>AB?{HpNp2XyxTcO!=8s`dSuq$
zL!6owZL~i!OU>&1_>2L4Dl*GS%_1Zs+7}>wyP+p%UW?gjy&g=x?Q}%lA`COu>=Td&
zsBF_UOq;roM`(NCiY1i|N?*w{NycG{E%FMFbNE&zG0;dh8-`K(p>ggd^XAPHq34?}
zy8Ef2-JhIy-tM8N?!Kt$dCNEIF~lPOIUN6ch(5IRYybD7vMk#6_Y|#UweJ7*NVLDj
zOw;V~x>a1Jxg|yGu7+IX(44}zmi24wGRw15u}T!KwUWzA2Up~+fLn9{QUAxZ+;X1S
z%DE^uAZ`qEiix*~MR=*Ak2|YfKJuChM3);rDh`CFNXtG>@-)^C-&(zuJt}w(tiK|Y
zohlrMFCg;7jm%0iWnE#Bui45`_pY7W+OMzWqGLbdb3{qJfRdWFBEUOPv-y}R6!s2Y
z^s7bU9JUlm=;%*cO4=pDG+ylv2OV&X3}b3F4apS@FZ@LV{t8SF?B6JoYkl6jv#`n{
zV)`^H*EpN!CsTcVl;={5vhR(uQ$jD1bdQxn<x06+SvFP@UtLkkmXKVsv@u&+!O4v%
zsr`md)pw(Gb$t;0KL%&k2PMa}-yrn?AUH?+H*p@aXj&SUQ>t?@TOHhv5ZwmbZb&nt
zPB1e!dm6=Dl_aL?1WdsI9FjclbUHO?b0aq$jZE0sGY0>xezXAy#Tnp}@nll{qO@jU
zXf?IXIWy$koH?;3T5s}XdU*23fZA@I^0EWwOxCF++Hu{R*K!g|jq=(EeaO_z!pB>-
zmGqFend|1(pp$wmsaLc6c(ZGifi>UP)2oeKhXrjhIf+s|WR*(5W(J(nHLsYdR2m$D
z3Pt0g6V|@@CN32`&&37E(ZM~Z3;hrnrQ+Olx9lMB+=i#UWsa2H5SlA?xp~I{nbOjo
zH)@`xCv8~#VQ$+M^mTEk*e7{EM{k~2U5I(X<FQyAz0ZL=7*XABo=X`?QGD^R!>{uk
zfd1BiGpOm2uv0{RYrP#dX+=?i5h(j%8)LG7RA?j9ObeEJ&-z7+OA&^1NJ@;Bu0pJB
zbFVo52r;@^AK7}`#Oqs@ik0hE9=}z5E5CB7SiN{lN9UH2l^?1e-mwMN4z+B=kA3|-
zY7AOJ?J#uAj{>C4NVob~tjNLQx)}lx&bxmDH&E<*zC+}VVa3GY-dhk7bU9X>^M8sc
za1l{3hZWC-enJ#JnJBV@D2n$*zd#hjwb&I{zYl%mN}@y?Q4-ImPA5v^d}cm^o61=6
zt!9J}w46`WiU_IJONg>KpT&FIZX#-bk|>97<+l-aEFvl#2UoInL|u5k>*qw>4-gfP
zA?iW-de0>4gX?YI<3y#cSZ^mPqwHneQ$`v4JBbE7M1$Q}pCg)s`{rInROv%jvu3Q%
z5Y0om=i&U&HAM3lASxbkEkM~9y0E@TwCLAFi&3@_Jip`;qNOXbzDiUbAzBv0`Xtc-
zClMVOz<Ll?+<y@6I~e6V<Vd3Bc-IPCJM;vi!_Fl-{A{9?fbWPah>m=K=%}v}9gS<N
zP|j6*iB_X5Yf#_E;M%c|5RKtGW1k@!2h8I?CpsR-Z$g{B`8c8z@Se4|6RoQfod}pt
zLV4D^h)&k9;$0h#1}f|(+H@Jw=I;`1>A?B|(N-Lvf;M=|`9!CF3F`#WwlSj9?jbt;
zk3>7>A)Phe_133}cIJq7olf+&L$KbA^(RETuP1u@I-)bXu|BERvrs>0<J{S(t8?B&
z^v=&?{Wa0KJy<_Tbe;z*-f<qvd_Kx_!B(t*?_GH3g(&ZZ8;LGjL3A;`bqUU0g7ROQ
z!g>kOWmgfs8+CH|14Qq^d#`wg=*rI$U4?R9^#aj*--7l35nYY%UDJm3Nuq1_5MB2r
zqW9yu>pz6`mq<CZ6zfljKG=%&KCIaPhug7!pXeV)u%3zaQKB2JVLD?j?4db*!B@dk
zG*BT}5D>lVh7Q^bE4&|btOlW%55qSoirHD?h*3>KOP_}OT@%#(Eszzm)CMhm4yK3>
zDo`gpFS?Q2wFglyeefhIBc5phY-tY7g@x8YMB5O}r(s$^3uzH8rV;4%m(nOzX&D^=
z4gW!OFdah6LCX%M!{~5YNk`C;(E1-ut7tW?p=0P+8l!PKj*h1{(VOW6T1)HbL^_Gq
z)5){}v|<x&rY*FUPNBEZskDtwqtj_S?Vz{P8MKpj(c5S@y`9dav*>Jk2c1Ljq;u&!
zI-f3}chQA(5nW7|(4}-4y_+tl_s|t|C0#{V)BEUpx{+?8o9QET3*AZ|rQ7LFx{L0n
zd+6hIFMWdUqx<Or`XqgdK24vY2kEo)Ir=>P6McccNME9Vrbp<@^e8<>kJA(MBt1n>
z(^u#jdX~OQU!&*fd3u4qPA}3+w1@tM_R=@#oAfREHoZ*Wp;zd;^gTk0V}Ufni|9mq
z@zRPj*uyai7dN6>;9(`>n#@D<Bp!$0;`YGI8VH8Mk!UQQNFw=HQ*%pewyiyfpt8=c
z?qW}GU#Z+bFgRy!#h5oVe|W*dMT<w4EFG;bJK(^B4nAc0ibD@OeB}{G9(DAp)oYG9
zc5M8(<KOh=6V|Rf@gy|ChK-vxZ`pdvTTb0}+UeVOy!DKoyWY0@?Ps2K_B+mb=eg&d
zf5E#hyy)UfF1_sCm%rzVE3cyWUd;u2pDNuo*V1+Gzy1Rsq<;X~-teItZ~E}fAGzh$
zkKT6s9UmjQ^RBz^`S`t`xbOZ4KKZFnf9Ao59{%j-KL1Z&_~MuT`H?R_`q<-7Jo(hq
zUwP))uYT=0yvm_Hg6#poC?_!bT)GV{^C@}=t?@O~=WFyk+DDUOu2?44h%?1C+Gn*V
zw5POh=Mu;*+Lr6cb?4^f7UerSk{wOI)FvnKt{htZ4!q+tXwxsErCy<5(d*_rR-5m5
z9Pikhi{~=A)?7}$W1;yDlJ8J3{%5xW@JtAgXvSZg$cd^L6T8Lv;&Suv3Zee45?6`q
z#RtWQ#LeQP^6z#b|M21efA{Sh=>xKF-UD>G1U>RSbPfF@eGqi%a`dGO(MvBw?|YW6
zg|+f}^wWpXS|64a;k}><p9NKTkRC=~RDE(YdL#GBn?Wg_NAG@2_RX#6^KSv&I2ANw
z8>q&0pc`)m<zTw;Hc$>lH_is-cn7G)IrM(ejdLaC5TFH*qw_IsxC;pURrK-aYJL1`
z=<iH1?x2r>KHLV%@hQ-n`$1(s1X{t=;|kD`2S6j3if~iqKr69`4z+^DltepRy;mSA
z=a*E1WiX|Ug1SD4;~=hqMvH6Uef2BQ+^Z*lEyh8k--UY)#yQ-N^;z?`$^7MWCEQQe
zF<{T~vzk|ZL;l`MDcwbjtb4>4<hx4p_d#<X?~&zG-zkajqkQw~*W|Om#xbva&kd7*
zu+Hg2IR3O*#yiL@kSkT>@qHh;wPpBy2K4~Z_P_1>bMU=e@m>6iuVA%cdKTrfV7JcA
z_G{hC_nRx~CrI}oPvAYs*muw5OSSjT_73a(?@%|Vqa4puNlQ=uO#BS*#IbfHRrK$o
zp4ZVLUbUB1J%P57-h_L8hjkyG{T!bCJnps5-KyG3TYz_T;QCc+#mK0aASv0)rMKe!
zSmn9vaNpr-1@5MJweF?YCciD7#P@%R^H{YFc<vu$86*x$d@N4>T7SiS#;V80x{>w5
zb!5F)^g-)t)r0vf@$52`a}idSWd4NpYD(h1bI`j9+%}K#;iR|#*MCJTwCD75^()~u
z1y=}tMBkwuJNaWwa5A8MQD3e7Nc>!Uls1TK#Y$~RON)mvD#rM7@)q$gV(a8@>1^@Z
z<W<1NJ(K58o*|ad?<c!JZGJ!xfVPG(_clh-7*CEs8W}_XJ&eu}2LV^V2<nu@nVTWM
zl)(QZpb#5DtCoP4+z;sqi<l>_mb{4%?2E;`?dNR!%eL*>39gp=rKbNBWg(RJTk>)Q
z+ZVlFD048kxYOZrYMSOi)D1#!YKy>u6J8qTg6s7IxrcCRxK+)5T^G7_(e{fk@vF=Q
zemU?Fb9y}<H=NSo7wd2%K8b&w@`Lz1iilm!p=nN!QwZHFA62iBA3#hv0u6Cp(;Yq^
z2F8F1F_j3N#LEE_N5h*7V8XjSSosT1d<gH93ywTo6rFu>-{3l`3k&YH7A_4J#yZ9?
zUv;?Po95Ou{uVyy&=6biKu8TfgCmBCKd)&n1hEU<Ckv!rBR{|}p*3*E;q?2xCQLpB
z6GHWEFyS3efNOo93sO6fdlpRUjv1~in5-9=zl|`tAO!*@KVob&-Rr{Vp{>(gE)yoN
z7tnDFIT19ZyL~R9>3;d5sW36jfC*`8Buq%+2Zv7G=|cM=0?Aqc6TZRU!IxYvK0**b
zFF5kyBw#{p?CjTpFXr9yDSi+O7sfiqFW=&D2YehZgx5QrKEUJ#79wy6pTQBs<l;am
z-R*aw+yPl2^&0sB^Z>YW<C5ld1%p0fMD@5hHcY|fseeubfNp%kT(}^9wGWuE$8ky?
z3939h{kjR0`MmYh2$LJay36SaLRkZt+^A9?V%led32Ivp%BeYm>T|Mcroj{n`4vp=
zpa-4J<wpBKA!IFp3E%Kz<?t~#AK`!(9Qkn)SOJ*c;5ym~SFxH)tuWRJ{5pB{gn%=^
zD!$u~w)dcFJq}#);|O@CyU}X8?hP_bAz2`<8n>J8L9rP>-9Q_sI~)!GCIq^<LtYCe
zq>!~1^jSAIp}F9_Zu0=8#2&+ho;~|@^lR&)?H8ZsSDA~)>GrstPzVS8z$#EbcfjM)
z5y0m1a(M$#vMHFD(t1N4z!a8`s@F)EK&ecaT<%CDh(JUpq+tn@2kiu+YAt{X-{9}C
zHqWEuD5$RCD2S6FeO@<C&vqTJ#-04Exzq|{oxrcl4FJ56P$-}~@On3J#;tqNi@gq9
z4F)+c39t^W=5YAJfXNw=A7q$775Pno3A7T?db-OKjfNylK2O*OqUiRZpZWMEwP*m)
zi%;-k!W2?ha1`R|MTeH4&URgwpH$D(wyH4Jq1WXBOui^^1~7s8d4i}X&N%F2m_i|h
z?{iP`I6QzU;ss1m`K%o#=4%orw<i`;F!{X^36mFrK428q0@{jigs|dEUN0Yo)ipQv
za8kka2G;=-m(qHn!T~N!?F`rwr%d+8fHS&-zl9HabRVdN&xyN2A*8<Mo`hC&IQ&r%
zM`uhHNWF&d@q+rIExkD7_QvC3Vj}7HM*V0f4=!q86xO1ny3mC7GDp-klro}V@-wJ)
zm>aLVbQj-Whe-m}2$Rq4WtifTNJw{vAq4<uJP2Qf<%r80Mv4;!6LZ8s6okYTx4|So
z0GL38S-fz26Nw1J<O=v=0TvB>x?2aMuol3CZ{R!lsu$tbIEtui9_#^Ju&96+r)Rs)
zFySgzbCET|Fj*(?>-PG6?mz+=1a&7~kJ@6G*c#@<)d-G2-5~Nvm|_Ukbs^sdZd0!T
z14GFGwo~^p8TKWUQNV=kH@<iPgnl|qejlTyS!TS~7v)#*311ZN1!)d2s0yYTuIuuX
zb(l~TAQ2Yz8s7RnNO0~6Bx5na6oq61obfsWfGNN*MWZ#Cd`@RDj*xX%QhrdqMt;D7
zK4-y{O2s5hL4P6$n7n@7ql5Wbi;n7Iv;<`Mw%>uHn7Zc09>4`mK_70K?K-#z8$Pg_
ziv)!WW1YaS#|Hp{sdzjhVFDNoQ^4yDx^OiX^MhRQ15So1!7!!d2i0r9z)&*W0<#Lv
zc>L*fjF@c&{mGeO3iyGR_A<x$6#&%lj{^{}UDz3Czm8Y)-F27%pN~<*22;R;h$v4e
zok&C-t{6Bk`hm|81O=?Y1ezyda=Aju0O&w^c9^{WOeQX23I$Rjw39D@b^=4U7F`cw
z%Bpw(koo<A04fhtAj-vuJzs!f3i)w*w(ATNu3|M8hLEe1Uu7*`e=y(;We`H)aPhbN
raljNpMy!wvx5RP8Fa-iEjfGPTQ$~JJy#`DfCG!ILbdUsxH}L-f1n7&k

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/1.png b/BPASmartClient.SCADAControl/Images/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..338a4465123a3b645e090a439e60767116e767d4
GIT binary patch
literal 212
zcmV;_04x8AP)<h;3K|Lk000e1NJLTq00M9T000391^@s6Uh<Rf0001+Nkl<ZNQv!{
z;R=8-2!x&W{`AD!j}op!TLcS&eK2%4&)I6S`6>quVk}LfoKZnvAa8W0(0eKR3;9C}
zu-2)jfv%(nDpxW;=lmAfQzf6V(z2O)dp<+>d){()M-cBlf>C`ZW0?PI@-_a$JHMLQ
zU)<$IUe)xx90M!77;&+NKBIl+GsuO`EzvlyyxBaxi1k+Nc|LnsbJ2E`Oh=tj?rjPH
O0000<MNUMnLSTY1KU)R>

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/日期1.png b/BPASmartClient.SCADAControl/Images/日期1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c48a430e6476e874ccd08904e0be8df51b6f152
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00058Nkl<ZNQvE+
zJxd%>6o%i8D6H7nq>*GTbU~~F39Q)<7e9)025j_)*hDPM9}o*aN&^XkU6L-1pq*`s
zR11oRWG%BRTDXr4oQ3N+d+*MaIdB=~ocEmP-nnz;P7Y8?JC{^Qlad7zCFIg1JWET+
zVsXfnq*9>Hc_98q(zI_SBa*&Kn)ehL_rxlazDXK=<c;<uHmX1qs3pXFqXhf`7UP<v
zJvouIB<Z>1iyq-8Ntcp3cKsr$>}bX$tw{Ruq+(!p1Hcy0p||Y<gT6W;$hOtK1wH~r
zAP-Cc8^Ddl_p(Atwt_pL(nB)?v<+0x0y(tg&A@6unC>VG<jRtZ0m!)N{`w#dXHT!3
z;Jx|s0Z7it@A`f@zJ@RPw}~bLke8-w_R{#iUB`A^^=M?h5!q=^g=dCUn_=7Dq9n~L
zpk=y+tbMZMfYyP6`CkBQz(0#0WbKn^3<3L|ZjbD<=~6?=z_N2+w?1fE;cMVK@Xpb^
z2j2DzsacU~V3kRE&7{1zuw;PQlz{G-Gtg_-A3x)x6Kz=1ndg-a{YXT|LQB%muH*mx
gk?6-RQmG|900L`+zJpHeL;wH)07*qoM6N<$f^iGyQUCw|

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/返回按钮1.png b/BPASmartClient.SCADAControl/Images/返回按钮1.png
new file mode 100644
index 0000000000000000000000000000000000000000..090324dd3cc4cc8ec9b33018572373b2120c3960
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^1wgFD!3HF=zuvzEq;7h;IEGZrd3(o^*U3=C<)S&S
zoCA|lM8eb6jO-kWjl4k-j}|TYtCd%Eo{4ep9{cr~PJP?2?`<jdSXwvz^<j=mzxm&<
zh1s)g3z4>8G>fro%~I>e5M^uog&8Z;YGRbF)dkM_YsADPorp>L@JuMVA!H--%Qp@t
z)&l4GTsAX*gfJN%J`;L8Tkq<LbyH<eT;1!optAQsG1J9woLiW8zHu-ED&_<#2I>Pb
z86MW~yL`44IKN%RW_y6a_JBQ=6XX91+?eCAY2M%Zq;u!rZ~GOg5c-NgBT8zw;r)m`
QKu<Dwy85}Sb4q9e0Q41bZ2$lO

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/返回按钮2.png b/BPASmartClient.SCADAControl/Images/返回按钮2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d430e8f9bded8e41750542f23584b49f0219a6
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^1wgFD!3HF=zuvzEq%L^6IEGZrd3)y|?;!^sm%x5k
zZoxSg!5nv6y9ACdnDZhjaFW)(Z~KL=ed;rxHtF@Rx~UuVR$j@kj&fXZ`){!AZ^a9x
zp=tKa8*Vg~%uQqudb{;Am#g>Ir;odwdFF;|#K<I_kV*Q`r+ADh=qS$;W9Exz9BhmQ
z&hi|AFu6I(c?{o`to(MXbY^4B;dGW+=Q(Vw1>U}KFrILlC&ifg;~NJP;|b@$OdW+e
zza31zH&(ox^kI(E!8uMJ_c(q0BjjvW^iTcS#+r0{u4P_-84p`aY`K+?+6wd=gQu&X
J%Q~loCIAska7O?D

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/返回按钮图标.png b/BPASmartClient.SCADAControl/Images/返回按钮图标.png
new file mode 100644
index 0000000000000000000000000000000000000000..587dfd95ea36ee03bfc0197afc0a6e1e8e73b9cb
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000>P000yS1^@s6cz2e)00047Nkl<ZIE}T`
zy-J)x6vpx2nh=p7q)2O{vCxQC@dB*;Y?4b*QAlO5T){#M3794X1L_qB7K)YV4G0!d
z!A>hd+XO<;tPIS`th~OuyY2%6!_1uXpLyoY6oxmhJfdDKVd$}i52-0<t_^EA#9*y}
zpqCkAZ!n85XsIW87UUHsF^{*;k-V&6R{@`JjPE&sQcnAe6D*@U3-T2kcvr_}o6&_C
z{K86VbyM{JBTnmpqzXBwupO`9uDUkSgU`5pAh?jzS}_n4mo*UWt0>`X{6Gg5@u!O2
z|HeMXFqe!^<9*gU2?0fPVm-pE(E_&O`WKkUdyE$tM;~^o1bs{TgL#m$LTQdv2{}mm
z?N5Q!qEZs`uThW>N&mc2keQ^v+XzT8mU7SyR<nNLTJ#$I@dRT@{7)R+hm`7LRcNnl
yTO;iHA5SnEDk}^;mtEltIt!N^?jTrnH-lRk4L+qxxMA)90000<MNUMnLSTY7V6Maf

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml
index 2e5b6d07..f92f090d 100644
--- a/BPASmartClient.SCADAControl/Themes/Generic.xaml
+++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml
@@ -3065,35 +3065,40 @@
 
     <DataTemplate x:Key="X_PageBoxStyle">
         <Button x:Name="dsd" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" BorderBrush="Transparent" BorderThickness="0"  CommandParameter="{Binding .}" Command="{Binding DataContext.MenSelectPageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
-            <Grid >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
-                </Grid.RowDefinitions>
-                <Grid Height="50" Width="100" >
-                    <Grid.Background>
-                        <ImageBrush ImageSource="../Images/bj.png" Stretch="UniformToFill"/>
-                    </Grid.Background>
-                </Grid>
-                <Rectangle Height="50" Width="100" Stroke="CadetBlue" StrokeThickness="1">
-                    <Rectangle.Fill>
-                        <VisualBrush Visual="{Binding visual,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
-                    </Rectangle.Fill>
-                </Rectangle>
-                <Rectangle Width="100" Height="20" Grid.Row="1" Fill="Transparent" Stroke="CadetBlue" StrokeThickness="1,0,1,1"/>
-                <TextBlock  FontWeight="Bold" Margin="5,0,0,0" FontSize="14" Foreground="#FFFFA500"
+            <Button.Template>
+                <ControlTemplate>
+                    <Grid Margin="0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid Height="50" Width="100" >
+                            <Grid.Background>
+                                <ImageBrush ImageSource="../Images/bj.png" Stretch="UniformToFill"/>
+                            </Grid.Background>
+                        </Grid>
+                        <Rectangle Height="50" Width="100" Stroke="#4818659B" StrokeThickness="1">
+                            <Rectangle.Fill>
+                                <VisualBrush Visual="{Binding visual,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                            </Rectangle.Fill>
+                        </Rectangle>
+                        <Rectangle Width="100" Height="20" Grid.Row="1" Fill="Transparent" Stroke="#4818659B" StrokeThickness="1,0,1,1"/>
+                        <TextBlock  FontWeight="Normal" Margin="5,0,0,0" FontSize="12" Foreground="#a2c2e8"
                 x:Name="txt"
                 Grid.Row="2"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Bottom"
+                VerticalAlignment="Center"
+                FontFamily="../Fonts/#Quartz M"
                 Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
 
-                <TextBlock  FontWeight="Bold" Margin="5,0,5,0" FontSize="14" Foreground="#FFFFA500"
+                        <TextBlock  FontWeight="Bold" Margin="5,0,5,0" FontSize="8" Foreground="{TemplateBinding Foreground}"
                 Grid.Row="2"
                 HorizontalAlignment="Right"
-                VerticalAlignment="Bottom"
+                VerticalAlignment="Bottom" Visibility="Collapsed"
                 Text="{Binding Sort,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
-            </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Button.Template>
         </Button>
         
 
@@ -3103,7 +3108,49 @@
     </DataTemplate>
 
 
-    
+    <Style x:Key="ItemContainerStyle1" TargetType="ListBoxItem">
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border     Name="Border"
+                                Margin="5"
+                                Background="Transparent" 
+                                BorderBrush="Transparent"
+                                BorderThickness="1"
+                                SnapsToDevicePixels="True">
+                        <ContentPresenter />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="#EA18659B"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#EA18659B"/>
+                            <Setter Property="Foreground" Value="#a2c2e8"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+                            <Setter Property="Foreground" Value="#a2c2e8"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="#EA18979B"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#EA18979B"/>
+                            <Setter Property="Foreground" Value="#a2c2e8"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="LightGray"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--#endregion-->
     <Style x:Key="image矩阵框" TargetType="Image">
         <Style.Setters>
@@ -3121,8 +3168,7 @@
         </Style.Setters>
     </Style>
 
-
-    <Style x:Key="image矩阵框1" TargetType="WrapPanel">
+    <Style x:Key="image矩阵框1" TargetType="Grid">
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
@@ -3162,7 +3208,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="image右1" TargetType="Image">
         <Style.Setters>
             <Setter Property="VerticalAlignment" Value="Stretch" />
@@ -3195,4 +3240,113 @@
         </Style.Setters>
     </Style>
 
+    <Style x:Key="borderSplider" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Height" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="../Images/1.png" ></ImageBrush>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="CommonBtn_返回" TargetType="Button">
+        <Style.Setters>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+            <Setter Property="Width" Value="68" />
+            <Setter Property="Height" Value="25" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="BD" Cursor="Hand">
+                            <StackPanel
+                                Margin="5,0,10,0"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Border Width="16" Margin="5">
+                                    <Border.Background>
+                                        <ImageBrush ImageSource="../Images/返回按钮图标.png" />
+                                    </Border.Background>
+                                </Border>
+                                <TextBlock
+                                    x:Name="textBlock"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Foreground="{DynamicResource ButtonSelectForeground}"
+                                    Text="{TemplateBinding Content}" />
+                                <!--  Text="{TemplateBinding Content}"  -->
+                            </StackPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="../Images/返回按钮2.png" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="../Images/返回按钮1.png" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="../Images/返回按钮1.png" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="BtnNull" TargetType="Button">
+        <Style.Setters>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="BD" Cursor="Hand"/>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="BD" Property="Background" Value="Transparent"/>
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False">
+                                <Setter TargetName="BD" Property="Background" Value="Transparent"/>
+
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BD" Property="Background" Value="Transparent"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="timeImage" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Source" Value="../Images/日期1.png" />
+        </Style.Setters>
+    </Style>
+
 </ResourceDictionary>
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index 567b0a25..d3bdae05 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -34,6 +34,11 @@
                     <ListBox x:Name="PageList" Grid.Row="0" Margin="0,5,0,0" HorizontalAlignment="Center" SelectedItem="{Binding MenuModel.SelectPageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ItemsSource="{Binding MenuModel.pageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ItemTemplate="{DynamicResource PageBoxStyle}" FontSize="14" BorderThickness="0" >
                         <ListBox.ContextMenu>
                             <ContextMenu>
+                                <MenuItem  Header="增加一页" Command="{Binding AddPageCommand}" CommandParameter="{Binding MenuModel.SelectPageModels}">
+                                    <MenuItem.Icon>
+                                        <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="Add" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
                                 <MenuItem  Header="设置首页" Command="{Binding SetHomePageCommand}">
                                     <MenuItem.Icon>
                                         <icon:PackIconModern  Width="10" HorizontalAlignment="Center" Kind="Home" />
@@ -49,22 +54,22 @@
                                         <icon:PackIconModern  Width="10" HorizontalAlignment="Center" Kind="Download" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem  Header="删除该页" Command="{Binding DeletePageCommand}">
+                                <MenuItem  Header="删除该页" Command="{Binding DeletePageCommand}" CommandParameter="{Binding MenuModel.SelectPageModels}">
                                     <MenuItem.Icon>
                                         <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="Delete" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem  Header="导出页面文件" Command="{Binding SaveAllPageCommand}">
+                                <MenuItem  Header="(加载)页面" Command="{Binding LoadAllPageCommand}">
                                     <MenuItem.Icon>
-                                        <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="Save" />
+                                        <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="DiskDownload" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem  Header="加载页面文件" Command="{Binding LoadAllPageCommand}">
+                                <MenuItem  Header="(保存)页面" Command="{Binding SaveAllPageCommand}">
                                     <MenuItem.Icon>
-                                        <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="DiskDownload" />
+                                        <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="Save" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem  Header="加载变量文件" Command="{Binding LoadValuesCommand}">
+                                <MenuItem  Header="变量管理器" Command="{Binding LoadValuesCommand}">
                                     <MenuItem.Icon>
                                         <icon:PackIconModern   Width="10" HorizontalAlignment="Center" Kind="DiskDownload" />
                                     </MenuItem.Icon>
diff --git a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml
index c428e98a..5a4eed9e 100644
--- a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml
+++ b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml
@@ -4,6 +4,7 @@
              xmlns:con="clr-namespace:BeDesignerSCADA.Converters"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:controls="clr-namespace:BPASmartClient.SCADAControl.CustomerControls;assembly=BPASmartClient.SCADAControl"
              xmlns:local="clr-namespace:BeDesignerSCADA.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -16,22 +17,59 @@
     </UserControl.Resources>
     <Grid>
         <Border x:Name="main" >
-            
+
         </Border>
 
         <StackPanel x:Name="waibustack" Orientation="Horizontal" MouseMove="wrapanl_main_MouseMove" MouseLeave="wrapanl_main_MouseLeave" >
-            <WrapPanel  Style="{DynamicResource image矩阵框1}"   Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Stretch"  x:Name="wrapanl_main" Orientation="Vertical">
-                <TextBlock x:Name="TitleName" Style="{DynamicResource imageTextBlock}" Padding="10" Foreground="#FFFFA500" FontSize="18"  TextWrapping="Wrap"  MaxWidth="118" HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding MenuModel.Name}" FontFamily="{DynamicResource Digital}"></TextBlock>
-                <ListBox x:Name="PageList" Grid.Row="0"  HorizontalAlignment="Left" VerticalAlignment="Bottom" 
-                 SelectedItem="{Binding MenuModel.SelectPageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
-                 ItemsSource="{Binding MenuModel.pageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
-                 Background="Transparent"
+            <Grid  Style="{DynamicResource image矩阵框1}"   Margin="0,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Stretch"  x:Name="wrapanl_main" >
+                <TextBlock x:Name="TitleName" FontWeight="Bold" Style="{DynamicResource imageTextBlock}" Padding="10" FontSize="18"  TextWrapping="Wrap"  MaxWidth="118" HorizontalAlignment="Center" VerticalAlignment="Top"  Text="{Binding MenuModel.Name}" FontFamily="{DynamicResource Digital}">
+                    <TextBlock.Foreground>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                            <GradientStop Color="#FF08A1E0"/>
+                            <GradientStop Color="#FF08A1E0" Offset="0.25"/>
+                            <GradientStop Color="#FF08A1E0" Offset="0.5"/>
+                            <GradientStop Color="#FF7FCEEF" Offset="0.75"/>
+                            <GradientStop Color="#FF08A1E0" Offset="1"/>
+                        </LinearGradientBrush>
+                    </TextBlock.Foreground>
+                </TextBlock>
+                <Border x:Name="border0" Margin="0,60,0,0" Style="{DynamicResource borderSplider}"></Border>
+                <ListBox x:Name="PageList" Margin="0,60,0,100" Padding="10,0,0,0" BorderThickness="0"   HorizontalAlignment="Left" VerticalAlignment="Top" 
+                  SelectedItem="{Binding MenuModel.SelectPageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                  ItemsSource="{Binding MenuModel.pageModels,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                  Background="Transparent"
+                  ItemContainerStyle="{StaticResource ItemContainerStyle1}"
                   ScrollViewer.VerticalScrollBarVisibility="Auto" 
                   ScrollViewer.HorizontalScrollBarVisibility="Auto" 
-                  ItemTemplate="{DynamicResource X_PageBoxStyle}" FontSize="14" BorderThickness="0" >
+                  ItemTemplate="{DynamicResource X_PageBoxStyle}"  >
                 </ListBox>
-            </WrapPanel>
-            <Border x:Name="lachu"  Background="Transparent" Width="30" HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0,0,0,25" BorderBrush="Aqua" BorderThickness="0,0,1,0">
+
+                <Border x:Name="border1"  Margin="0,0,0,80" VerticalAlignment="Bottom" Style="{DynamicResource borderSplider}"/>
+                <StackPanel x:Name="closeGrid" Height="80" Background="Transparent" Margin="0,0,0,0"  Width="100" VerticalAlignment="Bottom" HorizontalAlignment="Center">
+                    <controls:DateTimeUI Foreground="#a2c2e8" HorizontalAlignment="Center" Margin="5,5,5,5"></controls:DateTimeUI>
+                    <Border x:Name="border2"  Style="{DynamicResource borderSplider}"></Border>
+                    <Button
+                        x:Name="ButClose"
+                        Margin="0,5,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Content="退出程序"
+                        Cursor="Hand"
+                        Width="90"
+                        Style="{DynamicResource CommonBtn_返回}"
+                        ToolTip="退出程序" />
+                </StackPanel>
+            </Grid>
+            <Border x:Name="lachu"  Background="Transparent" Width="30" HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0,0,0,25"  BorderThickness="1,0,0,0">
+                <Border.BorderBrush>
+                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                        <GradientStop Color="Transparent"/>
+                        <GradientStop Color="#FF21B7B7" Offset="0.25"/>
+                        <GradientStop Color="Aqua" Offset="0.5"/>
+                        <GradientStop Color="#FF21B7B7" Offset="0.75"/>
+                        <GradientStop Color="Transparent" Offset="1"/>
+                    </LinearGradientBrush>
+                </Border.BorderBrush>
                 <Image x:Name="lachuStyle" Style="{DynamicResource image右1}" Width="70" Height="30"></Image>
             </Border>
         </StackPanel>
diff --git a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml.cs b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml.cs
index abe7b519..fd636b91 100644
--- a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml.cs
+++ b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml.cs
@@ -83,7 +83,6 @@ namespace BeDesignerSCADA.Controls
         {
             RunMenu(BinaryFile.ReadBinary<MenuModel>(path) as MenuModel);
         }
-
         /// <summary>
         /// 运行菜单
         /// </summary>
@@ -95,70 +94,156 @@ namespace BeDesignerSCADA.Controls
             switch (canvas.Alignment)
             {
                 case MenuAlignment.左边:
-                    PageList.HorizontalAlignment = HorizontalAlignment.Left;
+                    int k = (canvas.Name.Length / 5 -1+ (canvas.Name.Length % 5 > 0 ? 1 : 0))*15;
+                    //左边菜单栏
+                    PageList.HorizontalAlignment = HorizontalAlignment.Stretch;
                     PageList.VerticalAlignment = VerticalAlignment.Top;
+                    PageList.Margin = new Thickness(10,70+ k, 10,110);
+                    PageList.Padding = new Thickness(0,0,0,0);
                     _StackPanel.SetValue(StackPanel.OrientationProperty, Orientation.Vertical);
-                    wrapanl_main.Orientation = Orientation.Vertical;
+                    //标题栏
+                    TitleName.Margin = new Thickness(0, 10, 0, 10);
+                    TitleName.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    TitleName.VerticalAlignment = VerticalAlignment.Top;
+                    border0.Margin = new Thickness(0, 60+k, 0, 0);
+                    border0.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    border0.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    border0.VerticalAlignment = VerticalAlignment.Top;
+                    border1.Margin = new Thickness(0, 0, 0, 100);
+                    border1.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    border1.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    border1.VerticalAlignment = VerticalAlignment.Bottom;
+                    //内部Grid
                     wrapanl_main.HorizontalAlignment = HorizontalAlignment.Left;
                     wrapanl_main.VerticalAlignment = VerticalAlignment.Stretch;
                     wrapanl_main.Margin = new Thickness(0, 0, 0, 25);
-                    TitleName.Margin = new Thickness(0, 10, 0, 10);
+                    //外部Stackpanl
                     waibustack.Orientation = Orientation.Horizontal;
                     waibustack.HorizontalAlignment = HorizontalAlignment.Left;
+                    //拉出按钮
                     lachu.HorizontalAlignment = HorizontalAlignment.Left;
                     lachu.VerticalAlignment = VerticalAlignment.Stretch;
                     lachu.BorderThickness = new Thickness(1, 0, 0, 0);
+                    //closeGrid
+                    closeGrid.HorizontalAlignment = HorizontalAlignment.Center;
+                    closeGrid.VerticalAlignment = VerticalAlignment.Bottom;
+                    closeGrid.Margin = new Thickness(10);
+                    ButClose.Margin = new Thickness(0, 5, 0, 0);
                     break;
                 case MenuAlignment.顶部:
-                    PageList.HorizontalAlignment = HorizontalAlignment.Left;
+                    //左边菜单栏
+                    PageList.HorizontalAlignment = HorizontalAlignment.Stretch;
                     PageList.VerticalAlignment = VerticalAlignment.Top;
+                    PageList.Margin = new Thickness(140,0 , 120, 0);
+                    PageList.Padding = new Thickness(0, 0, 0, 0);
                     _StackPanel.SetValue(StackPanel.OrientationProperty, Orientation.Horizontal);
-                    wrapanl_main.Orientation = Orientation.Horizontal;
+                    //标题栏
+                    TitleName.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    TitleName.Margin = new Thickness(10, 10, 10, 10);
+                    TitleName.HorizontalAlignment = HorizontalAlignment.Left;
+                    TitleName.VerticalAlignment = VerticalAlignment.Center;
+                    TitleName.Width = 110;
+                    border0.Margin = new Thickness(130, 0, 0, 0);
+                    border0.HorizontalAlignment = HorizontalAlignment.Left;
+                    border0.VerticalAlignment = VerticalAlignment.Stretch;
+                    border0.LayoutTransform = new RotateTransform() { Angle = 90 };
+                    border1.Margin = new Thickness(0, 0, 110,0 );
+                    border1.HorizontalAlignment = HorizontalAlignment.Right;
+                    border1.VerticalAlignment = VerticalAlignment.Stretch;
+                    border1.LayoutTransform = new RotateTransform() { Angle = 90 };
+                    //内部Grid
                     wrapanl_main.HorizontalAlignment = HorizontalAlignment.Stretch;
                     wrapanl_main.VerticalAlignment = VerticalAlignment.Top;
                     wrapanl_main.Margin = new Thickness(0, 0, 0, 0);
-                    TitleName.LayoutTransform = new RotateTransform(){ Angle = 0  }; 
-                    TitleName.Margin = new Thickness(10, 0,10, 0);
+                    //外部Stackpanl
                     waibustack.Orientation = Orientation.Vertical;
                     waibustack.VerticalAlignment = VerticalAlignment.Top;
+                    //拉出按钮
                     lachu.HorizontalAlignment = HorizontalAlignment.Stretch;
                     lachu.VerticalAlignment = VerticalAlignment.Top;
                     lachu.LayoutTransform = new RotateTransform() { Angle = 270 };
                     lachu.BorderThickness = new Thickness(0, 0, 1, 0);
+                    //closeGrid
+                    closeGrid.HorizontalAlignment = HorizontalAlignment.Right;
+                    closeGrid.VerticalAlignment = VerticalAlignment.Center;
+                    closeGrid.Margin = new Thickness(10, 0, 10, 0);
+                    ButClose.Margin = new Thickness(0,5, 0, 0);
                     break;
                 case MenuAlignment.右边:
+                    k = (canvas.Name.Length / 5 - 1 + (canvas.Name.Length % 5 > 0 ? 1 : 0)) * 15;
+                    //左边菜单栏
                     PageList.HorizontalAlignment = HorizontalAlignment.Right;
-                    PageList.VerticalAlignment = VerticalAlignment.Top;
+                    PageList.VerticalAlignment = VerticalAlignment.Stretch;
+                    PageList.Margin = new Thickness(10, 70 + k, 10, 110);
+                    PageList.Padding = new Thickness(0, 0, 0, 0);
                     _StackPanel.SetValue(StackPanel.OrientationProperty, Orientation.Vertical);
-                    wrapanl_main.Orientation = Orientation.Vertical;
+                    //标题栏
+                    TitleName.Margin = new Thickness(0, 10, 0, 10);
+                    TitleName.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    TitleName.VerticalAlignment = VerticalAlignment.Top;
+                    border0.Margin = new Thickness(0, 60 + k, 0, 0);
+                    border0.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    border0.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    border0.VerticalAlignment = VerticalAlignment.Top;
+                    border1.Margin = new Thickness(0, 0, 0, 100);
+                    border1.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    border1.HorizontalAlignment = HorizontalAlignment.Stretch;
+                    border1.VerticalAlignment = VerticalAlignment.Bottom;
+                    //内部Grid
                     wrapanl_main.HorizontalAlignment = HorizontalAlignment.Right;
                     wrapanl_main.VerticalAlignment = VerticalAlignment.Stretch;
                     wrapanl_main.Margin = new Thickness(0, 0, 0, 25);
-                    TitleName.Margin = new Thickness(0, 10, 0, 10);
-                    menuWidth = wrapanl_main.ActualWidth; 
+                    //外部Stackpanl
                     waibustack.Orientation = Orientation.Horizontal;
                     waibustack.HorizontalAlignment = HorizontalAlignment.Right;
+                    //拉出按钮
                     lachu.HorizontalAlignment = HorizontalAlignment.Right;
                     lachu.VerticalAlignment = VerticalAlignment.Stretch;
-                    lachu.BorderThickness = new Thickness(0, 0,0, 0);
+                    lachu.BorderThickness = new Thickness(1, 0, 0, 0);
+                    //closeGrid
+                    closeGrid.HorizontalAlignment = HorizontalAlignment.Center;
+                    closeGrid.VerticalAlignment = VerticalAlignment.Bottom;
+                    closeGrid.Margin = new Thickness(10);
+                    ButClose.Margin = new Thickness(0, 5, 0, 0);
                     break;
                 case MenuAlignment.底部:
-                    PageList.HorizontalAlignment = HorizontalAlignment.Left;
+                    //左边菜单栏
+                    PageList.HorizontalAlignment = HorizontalAlignment.Stretch;
                     PageList.VerticalAlignment = VerticalAlignment.Bottom;
+                    PageList.Margin = new Thickness(140, 0, 120, 0);
+                    PageList.Padding = new Thickness(0, 0, 0, 0);
                     _StackPanel.SetValue(StackPanel.OrientationProperty, Orientation.Horizontal);
-                    wrapanl_main.Orientation = Orientation.Horizontal;
+                    //标题栏
+                    TitleName.LayoutTransform = new RotateTransform() { Angle = 0 };
+                    TitleName.Margin = new Thickness(10, 10, 10, 10);
+                    TitleName.HorizontalAlignment = HorizontalAlignment.Left;
+                    TitleName.VerticalAlignment = VerticalAlignment.Center;
+                    TitleName.Width = 110;
+                    border0.Margin = new Thickness(130, 0, 0, 0);
+                    border0.HorizontalAlignment = HorizontalAlignment.Left;
+                    border0.VerticalAlignment = VerticalAlignment.Stretch;
+                    border0.LayoutTransform = new RotateTransform() { Angle = 90 };
+                    border1.Margin = new Thickness(0, 0, 110, 0);
+                    border1.HorizontalAlignment = HorizontalAlignment.Right;
+                    border1.VerticalAlignment = VerticalAlignment.Stretch;
+                    border1.LayoutTransform = new RotateTransform() { Angle = 90 };
+                    //内部Grid
                     wrapanl_main.HorizontalAlignment = HorizontalAlignment.Stretch;
                     wrapanl_main.VerticalAlignment = VerticalAlignment.Bottom;
                     wrapanl_main.Margin = new Thickness(0, 0, 0, 0);
-                    TitleName.LayoutTransform = new RotateTransform() { Angle = 0 };
-                    TitleName.Margin = new Thickness(10, 0, 10, 0);
-                    menuWidth = wrapanl_main.ActualHeight;
+                    //外部Stackpanl
                     waibustack.Orientation = Orientation.Vertical;
                     waibustack.VerticalAlignment = VerticalAlignment.Bottom;
+                    //拉出按钮
                     lachu.HorizontalAlignment = HorizontalAlignment.Stretch;
                     lachu.VerticalAlignment = VerticalAlignment.Bottom;
                     lachu.LayoutTransform = new RotateTransform() { Angle = 270 };
-                    lachu.BorderThickness= new Thickness(0, 0, 0, 0);
+                    lachu.BorderThickness = new Thickness(0, 0, 1, 0);
+                    //closeGrid
+                    closeGrid.HorizontalAlignment = HorizontalAlignment.Right;
+                    closeGrid.VerticalAlignment = VerticalAlignment.Center;
+                    closeGrid.Margin = new Thickness(10, 0, 10, 0);
+                    ButClose.Margin = new Thickness(0, 5, 0, 0);
                     break;
                 default:
                     break;
@@ -193,6 +278,34 @@ namespace BeDesignerSCADA.Controls
                 menuRunCanvasModel.MenuModel.SelectPageModels.runCanvas.RunSelect();
             }
         }
+        /// <summary>
+        /// 父窗体控制事件
+        /// </summary>
+        /// <param name="obj"></param>
+        public void PandClick(Window obj)
+        {
+            this.ButClose.Click += (o, e) =>
+            {
+                MessageBoxResult res = MessageBox.Show("确定关闭上位机软件？", "警告", MessageBoxButton.OKCancel);
+                if (res == MessageBoxResult.OK)
+                {
+                    obj.Close();
+                }
+
+            };
+            this.waibustack.MouseLeftButtonDown += (o, e) =>
+            {
+                if (e.ClickCount > 1)
+                {
+                    if (obj.WindowState == WindowState.Maximized)
+                        obj.WindowState = WindowState.Normal;
+                    else if (obj.WindowState == WindowState.Normal)
+                        obj.WindowState = WindowState.Maximized;
+                }
+                if (e.LeftButton == MouseButtonState.Pressed) obj.DragMove();
+            };
+        }
+
         bool ismove = true;
         int times = 0;
         /// <summary>
@@ -229,6 +342,8 @@ namespace BeDesignerSCADA.Controls
             }
             times = 0;
         }
+        
+        
         private int menuWidthDefault = 0;
         private double menuWidth = 86;
         private void MenuBig()
@@ -237,7 +352,7 @@ namespace BeDesignerSCADA.Controls
             DoubleAnimation da = new DoubleAnimation();
             da.From = menuWidthDefault;
             da.To = menuWidth;
-            da.Duration = TimeSpan.FromSeconds(0.5);
+            da.Duration = TimeSpan.FromSeconds(0.2);
             if (menuRunCanvasModel.MenuModel.Alignment == MenuAlignment.左边 || menuRunCanvasModel.MenuModel.Alignment == MenuAlignment.右边)
             {
                 wrapanl_main.BeginAnimation(WidthProperty, da);
@@ -259,7 +374,7 @@ namespace BeDesignerSCADA.Controls
             DoubleAnimation da = new DoubleAnimation();
             da.From = menuWidth;
             da.To = menuWidthDefault;
-            da.Duration = TimeSpan.FromSeconds(0.5);
+            da.Duration = TimeSpan.FromSeconds(0.2);
             if (menuRunCanvasModel.MenuModel.Alignment == MenuAlignment.左边 || menuRunCanvasModel.MenuModel.Alignment == MenuAlignment.右边)
             {
                 if (languageResDic.Contains("image右1"))
@@ -273,9 +388,6 @@ namespace BeDesignerSCADA.Controls
                     lachuStyle.Style = languageResDic["image左1"] as Style;
             }
         }
-
-            
-         
     }
 
     /// <summary>
diff --git a/BeDesignerSCADA/View/RunWindows.xaml b/BeDesignerSCADA/View/RunWindows.xaml
index 7f24090a..611c1d3d 100644
--- a/BeDesignerSCADA/View/RunWindows.xaml
+++ b/BeDesignerSCADA/View/RunWindows.xaml
@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:BeDesignerSCADA.View"
         xmlns:ctl="clr-namespace:BeDesignerSCADA.Controls"
         mc:Ignorable="d"
+        WindowStyle="None"
         WindowState="Maximized"
         Title="模拟运行器" Height="450" Width="800">
     <Window.Resources>
diff --git a/BeDesignerSCADA/View/RunWindows.xaml.cs b/BeDesignerSCADA/View/RunWindows.xaml.cs
index 2718b3e9..a41e0c74 100644
--- a/BeDesignerSCADA/View/RunWindows.xaml.cs
+++ b/BeDesignerSCADA/View/RunWindows.xaml.cs
@@ -25,9 +25,24 @@ namespace BeDesignerSCADA.View
             InitializeComponent();
         }
 
-        public void LoadingData(MenuModel frameworks)
+        /// <summary>
+        /// 1.根据菜单Model加载界面
+        /// </summary>
+        /// <param name="frameworks"></param>
+        public void LoadingData(MenuModel menuModel)
         {
-            runCanvas.RunMenu(frameworks);
+            runCanvas.RunMenu(menuModel);
+            runCanvas.PandClick(this);
+        }
+
+        /// <summary>
+        /// 2.根据路径加载界面
+        /// </summary>
+        /// <param name="frameworks"></param>
+        public void LoadingData(string _path)
+        {
+            runCanvas.LoadingData(_path);
+            runCanvas.PandClick(this);
         }
     }
 }