修改icon

BlankApp1/BlankApp1/PLCTool.csproj

@@ -14,7 +14,12 @@
     <None Remove="Assets\Images\Pass.png" />
     <None Remove="Assets\Images\register.png" />
     <None Remove="Assets\Images\wifi信号.png" />
+    <None Remove="Assets\Images\业务管理.png" />
+    <None Remove="Assets\Images\作业简报.png" />
+    <None Remove="Assets\Images\基础配置.png" />
     <None Remove="Assets\Images\电量蓝色.png" />
+    <None Remove="Assets\Images\监控管理.png" />
+    <None Remove="Assets\Images\系统管理.png" />
     <None Remove="Views\BusinessManageView\AutoTestView.xaml~RF1f86dd9.TMP" />
   </ItemGroup>
   <ItemGroup>
@@ -67,9 +72,24 @@
     <Resource Include="Assets\Images\wifi信号.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Assets\Images\业务管理.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\Images\作业简报.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\Images\基础配置.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Assets\Images\电量蓝色.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Assets\Images\监控管理.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\Images\系统管理.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <None Update="App.config">

BlankApp1/BlankApp1/ViewModels/SystemManageViewModel/MenuManageViewModel.cs

@@ -100,7 +100,14 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         {
             var menus = _iMenuService.QueryList();
             allMenuInfoList = _mapper.Map<List<Menu>, List<MenuDto>>(menus);
-            
+            foreach(var item in allMenuInfoList)
+            {
+                if(!string.IsNullOrEmpty(item.MenuIcon))
+                {
+                    item.MenuIcon = System.IO.Path.Combine(basePath, item.MenuIcon);
+                }
+            }
+          
             MenuInfoList = new ObservableCollection<MenuDto>(allMenuInfoList);
         }
 

BlankApp1/BlankApp1/ViewModels/TreeMenuViewModel.cs

@@ -20,7 +20,7 @@ namespace BlankApp1.ViewModels
 
         // 列表，没有树型结构
         private List<Model.Entities.Menu> origMenus = null;
-
+        private string basePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Images");
 
         IRegionManager _regionManager;
         public TreeMenuViewModel(IRegionManager regionManager, IMenuService menuService)
@@ -73,31 +73,20 @@ namespace BlankApp1.ViewModels
             {
                 foreach (var item in sub)
                 {
-                
+
 
                     string icon = string.Empty;
-                 
+
                     if (!string.IsNullOrEmpty(item.MenuIcon))
                     {
-                        switch(item.MenuIcon)
-                        {
-                            case "e62d":
-                                icon = "\ue62d";break;
-                            case "e60e":
-                                icon = "\ue60e"; break;
-                            case "e60c":
-                                icon = "\ue60c"; break;
-                            case "e600":
-                                icon = "\ue600"; break;
+                        icon = System.IO.Path.Combine(basePath, item.MenuIcon);
 
-                        }
-                       
                     }
-                    
+
                     MenuItemModel mm = new MenuItemModel(_regionManager)
                     {
                         MenuHeader = item.MenuHeader,
-                        MenuIcon =icon,
+                        MenuIcon = icon,
                         TargetView = item.TargetView
                     };
                     menus.Add(mm);

BlankApp1/BlankApp1/Views/TreeMenuView.xaml

@@ -4,11 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:BlankApp1.Views"
+              xmlns:cvt="clr-namespace:PLCTool.Controls.Convert"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
     <Grid Background="White" >
         <Grid.Resources>
+            <cvt:StringToImageSourceConverter x:Key="MyImageConverter"/>
             <ControlTemplate TargetType="ToggleButton" x:Key="ArrowButtonTemplate">
                 <Grid Background="Transparent" Name="back">
                     <TextBlock Text="&#xe646;" FontFamily="../Assets/Fonts/#iconfont"  Cursor="Hand"
@@ -115,9 +117,10 @@
                             <ColumnDefinition Width="30" Name="c1"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="{Binding  MenuIcon}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                        <!--<TextBlock Text="{Binding  MenuIcon}" VerticalAlignment="Center" HorizontalAlignment="Center"
                                    FontSize="18" SnapsToDevicePixels="True"
-                                   FontFamily="../Assets/Fonts/#iconfont" />
+                                   FontFamily="../Assets/Fonts/#iconfont" />-->
+                        <Image Source="{Binding Path=MenuIcon,Converter={StaticResource MyImageConverter}}" Stretch="Fill" Margin="0,0,5,0"/>
                         <TextBlock Text="{Binding MenuHeader}" Grid.Column="1" Margin="5,0,0,0" FontSize="16"/>
                     </Grid>
                     <HierarchicalDataTemplate.Triggers>